summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.h
diff options
context:
space:
mode:
authorMiao Xie2014-03-06 06:55:03 +0100
committerJosef Bacik2014-03-10 20:17:29 +0100
commit573bfb72f7608eb7097d2dd036a714a6ab20cffe (patch)
tree5434c2e82299cf22af4470fef31d3890d209a0b9 /fs/btrfs/ctree.h
parentBtrfs: split the global ordered extents mutex (diff)
downloadkernel-qcow2-linux-573bfb72f7608eb7097d2dd036a714a6ab20cffe.tar.gz
kernel-qcow2-linux-573bfb72f7608eb7097d2dd036a714a6ab20cffe.tar.xz
kernel-qcow2-linux-573bfb72f7608eb7097d2dd036a714a6ab20cffe.zip
Btrfs: fix possible empty list access when flushing the delalloc inodes
We didn't have a lock to protect the access to the delalloc inodes list, that is we might access a empty delalloc inodes list if someone start flushing delalloc inodes because the delalloc inodes were moved into a other list temporarily. Fix it by wrapping the access with a lock. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fb.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r--fs/btrfs/ctree.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5f4921554f0a..2a9d32e193a5 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1490,6 +1490,7 @@ struct btrfs_fs_info {
*/
struct list_head ordered_roots;
+ struct mutex delalloc_root_mutex;
spinlock_t delalloc_root_lock;
/* all fs/file tree roots that have delalloc inodes. */
struct list_head delalloc_roots;
@@ -1805,6 +1806,7 @@ struct btrfs_root {
spinlock_t root_item_lock;
atomic_t refs;
+ struct mutex delalloc_mutex;
spinlock_t delalloc_lock;
/*
* all of the inodes that have delalloc bytes. It is possible for