ufs: kill more lock_ufs() calls

[firefly-linux-kernel-4.4.55.git] / fs / ufs / inode.c

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 99aaf5c9bf4d83f0f5ec6469d6d6cb20827750d0..0e4d88e0e709cf8a07b2c4f2c34cbbe2617ee392 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -867,11 +867,7 @@ static int ufs_update_inode(struct inode * inode, int do_sync)
 
 int ufs_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
-       int ret;
-       lock_ufs(inode->i_sb);
-       ret = ufs_update_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
-       unlock_ufs(inode->i_sb);
-       return ret;
+       return ufs_update_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
 }
 
 int ufs_sync_inode (struct inode *inode)
@@ -890,14 +886,12 @@ void ufs_evict_inode(struct inode * inode)
        if (want_delete) {
                loff_t old_i_size;
                /*UFS_I(inode)->i_dtime = CURRENT_TIME;*/
-               lock_ufs(inode->i_sb);
                mark_inode_dirty(inode);
                ufs_update_inode(inode, IS_SYNC(inode));
                old_i_size = inode->i_size;
                inode->i_size = 0;
                if (inode->i_blocks && ufs_truncate(inode, old_i_size))
                        ufs_warning(inode->i_sb, __func__, "ufs_truncate failed\n");
-               unlock_ufs(inode->i_sb);
        }
 
        invalidate_inode_buffers(inode);