]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Btrfs: set qgroup_ulist to be null after calling ulist_free()
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>
Sat, 13 Jul 2013 13:02:54 +0000 (21:02 +0800)
committerChris Mason <chris.mason@fusionio.com>
Sun, 1 Sep 2013 11:57:36 +0000 (07:57 -0400)
We call ulist_free(qgroup_ulist) in btrfs_free_qgroup_config(),
and btrfs_free_qgroup_config() may be called in two cases:

(1)umount filesystem
(2)disabling quota

However, if we firstly disable quota and then umount filesystem,
a double free happens. Fix it.

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/qgroup.c

index 1280eff8af56989dcc4a00e822527bd31ce2b3f9..64a9e3cb9453fbaf9742159648b9dc170f2360a8 100644 (file)
@@ -460,7 +460,13 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info)
                }
                kfree(qgroup);
        }
+       /*
+        * we call btrfs_free_qgroup_config() when umounting
+        * filesystem and disabling quota, so we set qgroup_ulit
+        * to be null here to avoid double free.
+        */
        ulist_free(fs_info->qgroup_ulist);
+       fs_info->qgroup_ulist = NULL;
 }
 
 static int add_qgroup_relation_item(struct btrfs_trans_handle *trans,