summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2014-01-09 10:06:10 +0800
committerChris Mason <clm@fb.com>2014-01-28 13:20:28 -0800
commitf1de968376340c97ac2d7acd25fa3107c398e0e5 (patch)
tree7d09c1d875d894f496bc59079143a8f09b0ccd78 /fs
parent7ef81ac86c8a44ab9f4e6e04e1f4c9ea53615b8a (diff)
downloadop-kernel-dev-f1de968376340c97ac2d7acd25fa3107c398e0e5.zip
op-kernel-dev-f1de968376340c97ac2d7acd25fa3107c398e0e5.tar.gz
Btrfs: fix the race between write back and nocow buffered write
When we ran the 274th case of xfstests with nodatacow mount option, We met the following warning message: WARNING: CPU: 1 PID: 14185 at fs/btrfs/extent-tree.c:3734 btrfs_free_reserved_data_space+0xa6/0xd0 It is caused by the race between the write back and nocow buffered write: Task1 Task2 __btrfs_buffered_write() skip data reservation reserve the metadata space copy the data dirty the pages unlock the pages write back the pages release the data space becasue there is no noreserve flag set the noreserve flag This patch fixes this problem by unlocking the pages after the noreserve flag is set. Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/file.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 72df63b..3dfd8db 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1591,9 +1591,10 @@ again:
unlock_extent_cached(&BTRFS_I(inode)->io_tree,
lockstart, lockend, &cached_state,
GFP_NOFS);
- btrfs_drop_pages(pages, num_pages);
- if (ret)
+ if (ret) {
+ btrfs_drop_pages(pages, num_pages);
break;
+ }
release_bytes = 0;
if (only_release_metadata && copied > 0) {
@@ -1607,6 +1608,8 @@ again:
only_release_metadata = false;
}
+ btrfs_drop_pages(pages, num_pages);
+
cond_resched();
balance_dirty_pages_ratelimited(inode->i_mapping);
OpenPOWER on IntegriCloud