STABLE10-conditionals-for-linux-ac-kernels-20010423

provisional compilation of features needed for alan cox kernels

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 09d7d9c284e227d7f75041884f785cc4e24a2a71..d2b90dfd92e77ffa045f596f5b4aaf295a7c1ac4 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -132,7 +132,11 @@ osi_UFSTruncate(afile, asize)
     lock_kernel();
     code = inode_change_ok(inode, &newattrs);
     if (!code)
+#ifdef INODE_SETATTR_NOT_VOID
+       code = inode_setattr(inode, &newattrs);
+#else
        inode_setattr(inode, &newattrs);
+#endif
     unlock_kernel();
     if (!code)
        truncate_inode_pages(&inode->i_data, asize);

diff --git a/src/afs/LINUX/osi_vfs.h b/src/afs/LINUX/osi_vfs.h
index 3e795caf257be45a486462896a4e6e7b8282addb..ac09f995add1eb13c5aa87c271e8009ba15a659f 100644 (file)
--- a/src/afs/LINUX/osi_vfs.h
+++ b/src/afs/LINUX/osi_vfs.h
@@ -49,6 +49,9 @@ typedef struct vnode {
        unsigned long           i_version;
 #if !defined(AFS_LINUX24_ENV)
        unsigned long           i_nrpages;
+#endif
+#ifdef STRUCT_INODE_HAS_I_BYTES
+        unsigned short          i_bytes;
 #endif
        struct semaphore        i_sem;
 #if defined(AFS_LINUX24_ENV)