From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 23 Apr 2001 08:54:11 +0000 (+0000)
Subject: STABLE10-conditionals-for-linux-ac-kernels-20010423
X-Git-Tag: openafs-stable-1_0_4~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1ad9883f6296d43fe2eaa1ad702a9c91c83807ff;p=packages%2Fo%2Fopenafs.git

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 09d7d9c28..d2b90dfd9 100644
--- 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 3e795caf2..ac09f995a 100644
--- 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)