diff options
| author |   Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-04-09 12:34:43 +0800 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-06-10 09:26:34 -0700 |
| commit | 9a4e7276d39071576d369e607d7accb84b41d0b4 (patch) | |
| tree | f0b3bb9284f7fd45b4275577d394769488bd0a27 /fs/btrfs/extent-tree.c | |
| parent | btrfs: qgroup: Make snapshot accounting work with new extent-oriented (diff) | |
| download | linux-dev-9a4e7276d39071576d369e607d7accb84b41d0b4.tar.xz linux-dev-9a4e7276d39071576d369e607d7accb84b41d0b4.zip | |
btrfs: wait for delayed iputs on no space
btrfs will report no_space when we run following write and delete
file loop:
# FILE_SIZE_M=[ 75% of fs space ]
# DEV=[ some dev ]
# MNT=[ some dir ]
#
# mkfs.btrfs -f "$DEV"
# mount -o nodatacow "$DEV" "$MNT"
# for ((i = 0; i < 100; i++)); do dd if=/dev/zero of="$MNT"/file0 bs=1M count="$FILE_SIZE_M"; rm -f "$MNT"/file0; done
#
Reason:
iput() and evict() is run after write pages to block device, if
write pages work is not finished before next write, the "rm"ed space
is not freed, and caused above bug.
Fix:
We can add "-o flushoncommit" mount option to avoid above bug, but
it have performance problem. Actually, we can to wait for on-the-fly
writes only when no-space happened, it is which this patch do.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 1acd63fcb252..38b76cc02f48 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3918,6 +3918,9 @@ commit_trans: !atomic_read(&root->fs_info->open_ioctl_trans)) { need_commit--; + if (need_commit > 0) + btrfs_wait_ordered_roots(fs_info, -1); + trans = btrfs_join_transaction(root); if (IS_ERR(trans)) return PTR_ERR(trans); |