]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Btrfs: fix a warning when iput a file
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>
Sat, 14 Dec 2013 07:27:31 +0000 (15:27 +0800)
committerChris Mason <clm@fb.com>
Tue, 28 Jan 2014 21:20:02 +0000 (13:20 -0800)
See the warning below:

[ 1209.102076]  [<ffffffffa04721b9>] remove_extent_mapping+0x69/0x70 [btrfs]
[ 1209.102084]  [<ffffffffa0466b06>] btrfs_evict_inode+0x96/0x4d0 [btrfs]
[ 1209.102089]  [<ffffffff81073010>] ? wake_atomic_t_function+0x40/0x40
[ 1209.102092]  [<ffffffff8118ab2e>] evict+0x9e/0x190
[ 1209.102094]  [<ffffffff8118b313>] iput+0xf3/0x180
[ 1209.102101]  [<ffffffffa0461fd1>] btrfs_run_delayed_iputs+0xb1/0xd0 [btrfs]
[ 1209.102107]  [<ffffffffa045d358>] __btrfs_end_transaction+0x268/0x350 [btrfs]

clear extent bit here to avoid triggering WARN_ON() in remove_extent_mapping()

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/inode.c

index b3b3142f173426feb09c4a6ff116795e2fa025a5..2ccf8e6b1e16b618cc83b9889bcd3700ec5dfb13 100644 (file)
@@ -4509,6 +4509,8 @@ static void evict_inode_truncate_pages(struct inode *inode)
 
                node = rb_first(&map_tree->map);
                em = rb_entry(node, struct extent_map, rb_node);
+               clear_bit(EXTENT_FLAG_PINNED, &em->flags);
+               clear_bit(EXTENT_FLAG_LOGGING, &em->flags);
                remove_extent_mapping(map_tree, em);
                free_extent_map(em);
        }