ocfs2: no need get dinode bh when zeroing extend
authorJoseph Qi <joseph.qi@huawei.com>
Tue, 14 Apr 2015 22:43:08 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:48:57 +0000 (16:48 -0700)
Since di_bh won't be used when zeroing extend, set it to NULL.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/aops.c

index 0c2848a..2a618dd 100644 (file)
@@ -706,7 +706,7 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
        }
 
        if (append_write) {
-               ret = ocfs2_inode_lock(inode, &di_bh, 1);
+               ret = ocfs2_inode_lock(inode, NULL, 1);
                if (ret < 0) {
                        mlog_errno(ret);
                        goto clean_orphan;
@@ -720,7 +720,6 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
                if (ret < 0) {
                        mlog_errno(ret);
                        ocfs2_inode_unlock(inode, 1);
-                       brelse(di_bh);
                        goto clean_orphan;
                }
 
@@ -728,13 +727,10 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
                if (is_overwrite < 0) {
                        mlog_errno(is_overwrite);
                        ocfs2_inode_unlock(inode, 1);
-                       brelse(di_bh);
                        goto clean_orphan;
                }
 
                ocfs2_inode_unlock(inode, 1);
-               brelse(di_bh);
-               di_bh = NULL;
        }
 
        written = __blockdev_direct_IO(WRITE, iocb, inode, inode->i_sb->s_bdev,