]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ocfs2-remove-kfree-redundant-null-checks-fix
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 20 Feb 2013 02:13:48 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:52:13 +0000 (16:52 +1100)
revert dubious change in ocfs2_begin_truncate_log_recovery()

Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/ocfs2/alloc.c

index 83a1a1d9d1bfa1db2f34116912d550b8362317a1..b8a9d87231b1badec1fb31f27c84265ca708aa55 100644 (file)
@@ -6134,7 +6134,7 @@ bail:
                iput(tl_inode);
        brelse(tl_bh);
 
-       if (status < 0) {
+       if (status < 0 && (*tl_copy)) {
                kfree(*tl_copy);
                *tl_copy = NULL;
                mlog_errno(status);