diff options
| author | Diego Calleja <diegocg@gmail.com> | 2011-09-01 16:33:57 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-20 18:10:33 +0200 |
| commit | 60ccf82f5b6e26e10d41783464ca469c070c7d49 (patch) | |
| tree | b99794e4dc34d6c9f4e51e7ec4def4946055b9c5 /fs/btrfs | |
| parent | 84850e8d8a5ec7b9d3c47d224e9a10c9da52ff1b (diff) | |
| download | op-kernel-dev-60ccf82f5b6e26e10d41783464ca469c070c7d49.zip op-kernel-dev-60ccf82f5b6e26e10d41783464ca469c070c7d49.tar.gz | |
btrfs: fix memory leak in btrfs_defrag_file
kmemleak found this:
unreferenced object 0xffff8801b64af968 (size 512):
comm "btrfs-cleaner", pid 3317, jiffies 4306810886 (age 903.272s)
hex dump (first 32 bytes):
00 82 01 07 00 ea ff ff c0 83 01 07 00 ea ff ff ................
80 82 01 07 00 ea ff ff c0 87 01 07 00 ea ff ff ................
backtrace:
[<ffffffff816875cc>] kmemleak_alloc+0x5c/0xc0
[<ffffffff8114aec3>] kmem_cache_alloc_trace+0x163/0x240
[<ffffffff8127a290>] btrfs_defrag_file+0xf0/0xb20
[<ffffffff8125d9a5>] btrfs_run_defrag_inodes+0x165/0x210
[<ffffffff812479d7>] cleaner_kthread+0x177/0x190
[<ffffffff81075c7d>] kthread+0x8d/0xa0
[<ffffffff816af5f4>] kernel_thread_helper+0x4/0x10
[<ffffffffffffffff>] 0xffffffffffffffff
"pages" is not always freed. Fix it removing the unnecesary additional return.
Signed-off-by: Diego Calleja <diegocg@gmail.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index d2b53eb..8ccc106 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1140,9 +1140,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, btrfs_set_super_incompat_flags(disk_super, features); } - if (!file) - kfree(ra); - return defrag_count; + ret = defrag_count; out_ra: if (!file) |
