| Message ID | 201109011633.57877.diegocg@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Diego Calleja wrote: > 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> > Reviewed-by: Li Zefan <lizf@cn.fujitsu.com> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux/fs/btrfs/ioctl.c =================================================================== --- linux.orig/fs/btrfs/ioctl.c +++ linux/fs/btrfs/ioctl.c @@ -1130,17 +1130,15 @@ int btrfs_defrag_file(struct inode *inod disk_super = &root->fs_info->super_copy; features = btrfs_super_incompat_flags(disk_super); if (range->compress_type == BTRFS_COMPRESS_LZO) { features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO; btrfs_set_super_incompat_flags(disk_super, features); } - if (!file) - kfree(ra); - return defrag_count; + ret = defrag_count; out_ra: if (!file) kfree(ra); kfree(pages); return ret; }
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> --- fs/btrfs/ioctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html