From 73716de680b336df1ca51fe60ce9526d9f43f2e7 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 12 Jul 2010 12:04:20 +0100 Subject: [PATCH] Linux: Use inode lock compat function We've now got a compatibilty function for locking and unlocking an inode. Use that in osi_file, rather than a local set of #ifdefs Change-Id: Ie64f0b758df0b90d0df2033d57729c8b09652c39 Reviewed-on: http://gerrit.openafs.org/2389 Tested-by: Jason Edgecombe Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/LINUX/osi_file.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 53784ca..13eb59d 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -173,11 +173,7 @@ osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) return code; ObtainWriteLock(&afs_xosi, 321); AFS_GUNLOCK(); -#ifdef STRUCT_INODE_HAS_I_MUTEX - mutex_lock(&inode->i_mutex); -#else - down(&inode->i_sem); -#endif + afs_linux_lock_inode(inode); #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM down_write(&inode->i_alloc_sem); #endif @@ -203,11 +199,7 @@ osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM up_write(&inode->i_alloc_sem); #endif -#ifdef STRUCT_INODE_HAS_I_MUTEX - mutex_unlock(&inode->i_mutex); -#else - up(&inode->i_sem); -#endif + afs_linux_unlock_inode(inode); AFS_GLOCK(); ReleaseWriteLock(&afs_xosi); return code; -- 1.9.4