[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>

9 files changed, 33 insertions, 33 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index a452b13620a2..bed9ad76c04c 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -215,7 +215,7 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
         unsigned offset, bv_offs;
         int len, ret;
 
-        down(&mapping->host->i_sem);
+        mutex_lock(&mapping->host->i_mutex);
         index = pos >> PAGE_CACHE_SHIFT;
         offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1);
         bv_offs = bvec->bv_offset;
@@ -278,7 +278,7 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
         }
         ret = 0;
 out:
-        up(&mapping->host->i_sem);
+        mutex_unlock(&mapping->host->i_mutex);
         return ret;
 unlock:
         unlock_page(page);
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 5b2d18035073..704c3c07f0ab 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -741,7 +741,7 @@ static loff_t memory_lseek(struct file * file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        down(&file->f_dentry->d_inode->i_sem);
+        mutex_lock(&file->f_dentry->d_inode->i_mutex);
         switch (orig) {
                 case 0:
                         file->f_pos = offset;
@@ -756,7 +756,7 @@ static loff_t memory_lseek(struct file * file, loff_t offset, int orig)
                 default:
                         ret = -EINVAL;
         }
-        up(&file->f_dentry->d_inode->i_sem);
+        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
         return ret;
 }
 
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 207cae366256..0a37aded4b54 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -138,7 +138,7 @@ static struct dentry *get_node(int num)
 {
         char s[10];
         struct dentry *root = capifs_root;
-        down(&root->d_inode->i_sem);
+        mutex_lock(&root->d_inode->i_mutex);
         return lookup_one_len(s, root, sprintf(s, "%d", num));
 }
 
@@ -159,7 +159,7 @@ void capifs_new_ncci(unsigned int number, dev_t device)
         dentry = get_node(number);
         if (!IS_ERR(dentry) && !dentry->d_inode)
                 d_instantiate(dentry, inode);
-        up(&capifs_root->d_inode->i_sem);
+        mutex_unlock(&capifs_root->d_inode->i_mutex);
 }
 
 void capifs_free_ncci(unsigned int number)
@@ -175,7 +175,7 @@ void capifs_free_ncci(unsigned int number)
                 }
                 dput(dentry);
         }
-        up(&capifs_root->d_inode->i_sem);
+        mutex_unlock(&capifs_root->d_inode->i_mutex);
 }
 
 static int __init capifs_init(void)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 0e481512f918..5c210b0a4cb0 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -837,9 +837,9 @@ static void __set_size(struct mapped_device *md, sector_t size)
 {
         set_capacity(md->disk, size);
 
-        down(&md->suspended_bdev->bd_inode->i_sem);
+        mutex_lock(&md->suspended_bdev->bd_inode->i_mutex);
         i_size_write(md->suspended_bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
-        up(&md->suspended_bdev->bd_inode->i_sem);
+        mutex_unlock(&md->suspended_bdev->bd_inode->i_mutex);
 }
 
 static int __bind(struct mapped_device *md, struct dm_table *t)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index e423a16ba3c9..0302723fa21f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3460,9 +3460,9 @@ static int update_size(mddev_t *mddev, unsigned long size)
 
                 bdev = bdget_disk(mddev->gendisk, 0);
                 if (bdev) {
-                        down(&bdev->bd_inode->i_sem);
+                        mutex_lock(&bdev->bd_inode->i_mutex);
                         i_size_write(bdev->bd_inode, mddev->array_size << 10);
-                        up(&bdev->bd_inode->i_sem);
+                        mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }
         }
@@ -3486,9 +3486,9 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
 
                 bdev = bdget_disk(mddev->gendisk, 0);
                 if (bdev) {
-                        down(&bdev->bd_inode->i_sem);
+                        mutex_lock(&bdev->bd_inode->i_mutex);
                         i_size_write(bdev->bd_inode, mddev->array_size << 10);
-                        up(&bdev->bd_inode->i_sem);
+                        mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }
         }
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 9eb465727fce..9cb6dd0834be 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -25,7 +25,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
         loff_t new = -1;
         struct inode *inode = file->f_dentry->d_inode;
 
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         switch (whence) {
         case 0:
                 new = off;
@@ -41,7 +41,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
                 new = -EINVAL;
         else
                 file->f_pos = new;
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         return new;
 }
 
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 4ddc453023a2..3cf945cc5b9a 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -184,13 +184,13 @@ static void update_bus(struct dentry *bus)
         bus->d_inode->i_gid = busgid;
         bus->d_inode->i_mode = S_IFDIR | busmode;
 
-        down(&bus->d_inode->i_sem);
+        mutex_lock(&bus->d_inode->i_mutex);
 
         list_for_each_entry(dev, &bus->d_subdirs, d_u.d_child)
                 if (dev->d_inode)
                         update_dev(dev);
 
-        up(&bus->d_inode->i_sem);
+        mutex_unlock(&bus->d_inode->i_mutex);
 }
 
 static void update_sb(struct super_block *sb)
@@ -201,7 +201,7 @@ static void update_sb(struct super_block *sb)
         if (!root)
                 return;
 
-        down(&root->d_inode->i_sem);
+        mutex_lock(&root->d_inode->i_mutex);
 
         list_for_each_entry(bus, &root->d_subdirs, d_u.d_child) {
                 if (bus->d_inode) {
@@ -219,7 +219,7 @@ static void update_sb(struct super_block *sb)
                 }
         }
 
-        up(&root->d_inode->i_sem);
+        mutex_unlock(&root->d_inode->i_mutex);
 }
 
 static int remount(struct super_block *sb, int *flags, char *data)
@@ -333,10 +333,10 @@ static int usbfs_empty (struct dentry *dentry)
 static int usbfs_unlink (struct inode *dir, struct dentry *dentry)
 {
         struct inode *inode = dentry->d_inode;
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         dentry->d_inode->i_nlink--;
         dput(dentry);
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         d_delete(dentry);
         return 0;
 }
@@ -346,7 +346,7 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
         int error = -ENOTEMPTY;
         struct inode * inode = dentry->d_inode;
 
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         dentry_unhash(dentry);
         if (usbfs_empty(dentry)) {
                 dentry->d_inode->i_nlink -= 2;
@@ -355,7 +355,7 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
                 dir->i_nlink--;
                 error = 0;
         }
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         if (!error)
                 d_delete(dentry);
         dput(dentry);
@@ -380,7 +380,7 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
 {
         loff_t retval = -EINVAL;
 
-        down(&file->f_dentry->d_inode->i_sem);
+        mutex_lock(&file->f_dentry->d_inode->i_mutex);
         switch(orig) {
         case 0:
                 if (offset > 0) {
@@ -397,7 +397,7 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
         default:
                 break;
         }
-        up(&file->f_dentry->d_inode->i_sem);
+        mutex_unlock(&file->f_dentry->d_inode->i_mutex);
         return retval;
 }
 
@@ -480,7 +480,7 @@ static int fs_create_by_name (const char *name, mode_t mode,
         }
 
         *dentry = NULL;
-        down(&parent->d_inode->i_sem);
+        mutex_lock(&parent->d_inode->i_mutex);
         *dentry = lookup_one_len(name, parent, strlen(name));
         if (!IS_ERR(dentry)) {
                 if ((mode & S_IFMT) == S_IFDIR)
@@ -489,7 +489,7 @@ static int fs_create_by_name (const char *name, mode_t mode,
                         error = usbfs_create (parent->d_inode, *dentry, mode);
         } else
                 error = PTR_ERR(dentry);
-        up(&parent->d_inode->i_sem);
+        mutex_unlock(&parent->d_inode->i_mutex);
 
         return error;
 }
@@ -528,7 +528,7 @@ static void fs_remove_file (struct dentry *dentry)
         if (!parent || !parent->d_inode)
                 return;
 
-        down(&parent->d_inode->i_sem);
+        mutex_lock(&parent->d_inode->i_mutex);
         if (usbfs_positive(dentry)) {
                 if (dentry->d_inode) {
                         if (S_ISDIR(dentry->d_inode->i_mode))
@@ -538,7 +538,7 @@ static void fs_remove_file (struct dentry *dentry)
                 dput(dentry);
                 }
         }
-        up(&parent->d_inode->i_sem);
+        mutex_unlock(&parent->d_inode->i_mutex);
 }
 
 /* --------------------------------------------------------------------- */
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;