hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ocfs2: no need get dinode bh when zeroing extend 

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>
This commit is contained in:
Joseph Qi 2015-04-14 15:43:08 -07:00 committed by Linus Torvalds
parent bdd86215b3
commit 7e9b19551c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ocfs2/aops.c
View File

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