Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull final vfs updates from Al Viro:

 - The ->i_mutex wrappers (with small prereq in lustre)

 - a fix for too early freeing of symlink bodies on shmem (they need to
   be RCU-delayed) (-stable fodder)

 - followup to dedupe stuff merged this cycle

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: abort dedupe loop if fatal signals are pending
  make sure that freeing shmem fast symlinks is RCU-delayed
  wrappers for ->i_mutex access
  lustre: remove unused declaration

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 6b1721f978c2..4f6f94c43412 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -689,7 +689,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        mutex_lock(&file_inode(file)->i_mutex);
+        inode_lock(file_inode(file));
         switch (orig) {
         case SEEK_CUR:
                 offset += file->f_pos;
@@ -706,7 +706,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
         default:
                 ret = -EINVAL;
         }
-        mutex_unlock(&file_inode(file)->i_mutex);
+        inode_unlock(file_inode(file));
         return ret;
 }
 
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index 0b311fa277ef..b526dc15c271 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -290,9 +290,9 @@ static int ps3flash_fsync(struct file *file, loff_t start, loff_t end, int datas
 {
         struct inode *inode = file_inode(file);
         int err;
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
         err = ps3flash_writeback(ps3flash_dev);
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         return err;
 }