[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem

This patch converts the inode semaphore to a mutex. I have tested it on
XFS and compiled as much as one can consider on an ia64. Anyway your
luck with it might be different.

Modified-by: Ingo Molnar <mingo@elte.hu>

(finished the conversion)

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 0cea9782d7d4..de59c58896d6 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -1891,7 +1891,7 @@ static int fsync_sub(struct lun *curlun)
                 return -EINVAL;
 
         inode = filp->f_dentry->d_inode;
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         current->flags |= PF_SYNCWRITE;
         rc = filemap_fdatawrite(inode->i_mapping);
         err = filp->f_op->fsync(filp, filp->f_dentry, 1);
@@ -1901,7 +1901,7 @@ static int fsync_sub(struct lun *curlun)
         if (!rc)
                 rc = err;
         current->flags &= ~PF_SYNCWRITE;
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         VLDBG(curlun, "fdatasync -> %d\n", rc);
         return rc;
 }
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 5c40980a5bd9..c6c279de832e 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1562,10 +1562,10 @@ restart:
                 spin_unlock_irq (&dev->lock);
 
                 /* break link to dcache */
-                down (&parent->i_sem);
+                mutex_lock (&parent->i_mutex);
                 d_delete (dentry);
                 dput (dentry);
-                up (&parent->i_sem);
+                mutex_unlock (&parent->i_mutex);
 
                 /* fds may still be open */
                 goto restart;