Merge branch 'upstream'

diff --cc configure.in
Simple merge

diff --cc src/afs/LINUX/osi_compat.h
index e4d0c28de64ef7ac351f1c25bb36c0e8ae3e4315,df887519d160116897cecbbaecadbb1e9ace7c56..37465fa806e772de1284fe5633fbcc465a01e02b
--- 1/src/afs/LINUX/osi_compat.h
--- 2/src/afs/LINUX/osi_compat.h
+++ b/src/afs/LINUX/osi_compat.h
@@@ -136,12 -136,24 +136,32 @@@ init_once_func(void * foo) 
  #define KALLOC_TYPE GFP_KERNEL
  #endif
  
 +#ifdef LINUX_KEYRING_SUPPORT
 +# ifndef KEY_ALLOC_NOT_IN_QUOTA
 +#  define KEY_ALLOC_NOT_IN_QUOTA 1
 +# endif
 +# ifndef KEY_ALLOC_IN_QUOTA
 +#  define KEY_ALLOC_IN_QUOTA 0
 +# endif
 +#endif
  #endif
+ 
+ static inline int
+ afs_inode_setattr(struct osi_file *afile, struct iattr *newattrs) {
+ 
+     int code = 0;
+     struct inode *inode = OSIFILE_INODE(afile);
+ #if !defined(HAVE_LINUX_INODE_SETATTR)
+     code = inode->i_op->setattr(afile->filp->f_dentry, newattrs);
+ #elif defined(INODE_SETATTR_NOT_VOID)
+ #if defined(AFS_LINUX26_ENV)
+     if (inode->i_op && inode->i_op->setattr)
+       code = inode->i_op->setattr(afile->filp->f_dentry, newattrs);
+     else
+ #endif
+       code = inode_setattr(inode, newattrs);
+ #else
+     inode_setattr(inode, newattrs);
+ #endif
+     return code;
+ }