diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:42 +1100 |
| commit | 846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch) | |
| tree | a19c658572beb8963dabe962f626265845b5d6b2 /fs/ocfs2/localalloc.c | |
| parent | 8cc156311126614ff6a59560e4eb20731156f799 (diff) | |
| parent | da691fd2697453e910a4bd0c8daaa80da48a0935 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ocfs2/localalloc.c')
| -rw-r--r-- | fs/ocfs2/localalloc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index a9f78c74d687..aebeacd807c3 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -476,8 +476,7 @@ out: if (local_alloc_inode) iput(local_alloc_inode); - if (alloc_copy) - kfree(alloc_copy); + kfree(alloc_copy); } /* @@ -534,7 +533,7 @@ int ocfs2_begin_local_alloc_recovery(struct ocfs2_super *osb, mlog_errno(status); bail: - if ((status < 0) && (*alloc_copy)) { + if (status < 0) { kfree(*alloc_copy); *alloc_copy = NULL; } @@ -1290,8 +1289,7 @@ bail: if (main_bm_inode) iput(main_bm_inode); - if (alloc_copy) - kfree(alloc_copy); + kfree(alloc_copy); if (ac) ocfs2_free_alloc_context(ac); |