diff options
author | Yan Zheng <zheng.yan@oracle.com> | 2008-11-20 10:25:19 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-11-20 10:25:19 -0500 |
commit | e556ce2c9d2163aea122e91a1512c9a110fece5d (patch) | |
tree | a9cc015cdaa47ab42b60525d1a4285cc723a21d7 /fs | |
parent | 4b4e25f2a6ddb070bab7f7dd2bd2926fb8db9e04 (diff) |
Btrfs: Drop dirty roots created by log replay immediately when
The log replay produces dirty roots. These dirty roots
should be dropped immediately if the fs is mounted as
ro. Otherwise they can be added to the dirty root list
again when remounting the fs as rw. Thank you,
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 981652233f70..fb04665e5005 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1757,6 +1757,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1757 | generation + 1); | 1757 | generation + 1); |
1758 | ret = btrfs_recover_log_trees(log_tree_root); | 1758 | ret = btrfs_recover_log_trees(log_tree_root); |
1759 | BUG_ON(ret); | 1759 | BUG_ON(ret); |
1760 | |||
1761 | if (sb->s_flags & MS_RDONLY) { | ||
1762 | ret = btrfs_commit_super(tree_root); | ||
1763 | BUG_ON(ret); | ||
1764 | } | ||
1760 | } | 1765 | } |
1761 | 1766 | ||
1762 | if (!(sb->s_flags & MS_RDONLY)) { | 1767 | if (!(sb->s_flags & MS_RDONLY)) { |