From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 15 Feb 2006 21:03:38 +0000 (+0000)
Subject: STABLE14-linux-inode-i-mutex-20060214
X-Git-Tag: openafs-stable-1_4_1-rc8~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1da49d414afd368b6fbff1aa49f840e0590554de;p=packages%2Fo%2Fopenafs.git

STABLE14-linux-inode-i-mutex-20060214


make i_sem become i_mutex
---

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 7711a75fe..272d81100 100644
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -204,7 +204,11 @@ osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
 #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
     down_write(&inode->i_alloc_sem);
 #endif
+#ifdef STRUCT_INODE_HAS_I_MUTEX
+    mutex_lock(&inode->i_mutex);
+#else
     down(&inode->i_sem);
+#endif
     newattrs.ia_size = asize;
     newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
 #if defined(AFS_LINUX24_ENV)
@@ -234,7 +238,11 @@ osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
     }
 #endif
     code = -code;
+#ifdef STRUCT_INODE_HAS_I_MUTEX
+    mutex_unlock(&inode->i_mutex);
+#else
     up(&inode->i_sem);
+#endif
 #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM
     up_write(&inode->i_alloc_sem);
 #endif