From: Darrick J. Wong Date: Fri, 2 Dec 2016 00:31:14 +0000 (-0800) Subject: ocfs2: always unlock when completing dio writes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbf896fc286a62bf215b904c6ff5d197df93e685;p=linux-beck.git ocfs2: always unlock when completing dio writes Always unlock the inode when completing dio writes, even if an error has occurrred. The caller already checks the inode and unlocks it if needed, so we might as well reduce contention. Signed-off-by: Darrick J. Wong --- diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 136a49cabc12..3c531f108a21 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -2392,13 +2392,10 @@ static int ocfs2_dio_end_io(struct kiocb *iocb, int level; int ret = 0; - if (bytes <= 0) - return 0; - /* this io's submitter should not have unlocked this before we could */ BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); - if (private) + if (bytes > 0 && private) ret = ocfs2_dio_end_io_write(inode, private, offset, bytes); ocfs2_iocb_clear_rw_locked(iocb);