ocfs2: do not put bh when buffer_uptodate failed
authoralex chen <alex.chen@huawei.com>
Thu, 3 Apr 2014 21:47:05 +0000 (14:47 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 Apr 2014 15:23:25 +0000 (16:23 +0100)
commit f7cf4f5bfe073ad792ab49c04f247626b3e38db6 upstream.

Do not put bh when buffer_uptodate failed in ocfs2_write_block and
ocfs2_write_super_or_backup, because it will put bh in b_end_io.
Otherwise it will hit a warning "VFS: brelse: Trying to free free
buffer".

Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/ocfs2/buffer_head_io.c

index 5d18ad1..4f66e00 100644 (file)
@@ -90,7 +90,6 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
                 * information for this bh as it's not marked locally
                 * uptodate. */
                ret = -EIO;
-               put_bh(bh);
                mlog_errno(ret);
        }
 
@@ -420,7 +419,6 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
 
        if (!buffer_uptodate(bh)) {
                ret = -EIO;
-               put_bh(bh);
                mlog_errno(ret);
        }