| Message ID | 20160809083021.12612-4-quwenruo@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 08/09/2016 03:30 AM, Qu Wenruo wrote: > When doing log replay at mount time(after power loss), qgroup will leak > numbers of replayed data extents. > > The cause is almost the same of balance. > So fix it by manually informing qgroup for owner changed extents. > > The bug can be detected by btrfs/119 test case. > > Cc: Mark Fasheh <mfasheh@suse.de> > Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Reviewed-and-Tested-by: Goldwyn Rodrigues <rgoldwyn@suse.com> > --- > fs/btrfs/tree-log.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c > index d31a0c4..9d9cb07 100644 > --- a/fs/btrfs/tree-log.c > +++ b/fs/btrfs/tree-log.c > @@ -27,6 +27,7 @@ > #include "backref.h" > #include "hash.h" > #include "compression.h" > +#include "qgroup.h" > > /* magic values for the inode_only field in btrfs_log_inode: > * > @@ -680,6 +681,21 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, > ins.type = BTRFS_EXTENT_ITEM_KEY; > offset = key->offset - btrfs_file_extent_offset(eb, item); > > + /* > + * Manually record dirty extent, as here we did a shallow > + * file extent item copy and skip normal backref update, > + * but modifying extent tree all by ourselves. > + * So need to manually record dirty extent for qgroup, > + * as the owner of the file extent changed from log tree > + * (doesn't affect qgroup) to fs/file tree(affects qgroup) > + */ > + ret = btrfs_qgroup_insert_dirty_extent(trans, root->fs_info, > + btrfs_file_extent_disk_bytenr(eb, item), > + btrfs_file_extent_disk_num_bytes(eb, item), > + GFP_NOFS); > + if (ret < 0) > + goto out; > + > if (ins.objectid > 0) { > u64 csum_start; > u64 csum_end; >
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index d31a0c4..9d9cb07 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -27,6 +27,7 @@ #include "backref.h" #include "hash.h" #include "compression.h" +#include "qgroup.h" /* magic values for the inode_only field in btrfs_log_inode: * @@ -680,6 +681,21 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, ins.type = BTRFS_EXTENT_ITEM_KEY; offset = key->offset - btrfs_file_extent_offset(eb, item); + /* + * Manually record dirty extent, as here we did a shallow + * file extent item copy and skip normal backref update, + * but modifying extent tree all by ourselves. + * So need to manually record dirty extent for qgroup, + * as the owner of the file extent changed from log tree + * (doesn't affect qgroup) to fs/file tree(affects qgroup) + */ + ret = btrfs_qgroup_insert_dirty_extent(trans, root->fs_info, + btrfs_file_extent_disk_bytenr(eb, item), + btrfs_file_extent_disk_num_bytes(eb, item), + GFP_NOFS); + if (ret < 0) + goto out; + if (ins.objectid > 0) { u64 csum_start; u64 csum_end;
When doing log replay at mount time(after power loss), qgroup will leak numbers of replayed data extents. The cause is almost the same of balance. So fix it by manually informing qgroup for owner changed extents. The bug can be detected by btrfs/119 test case. Cc: Mark Fasheh <mfasheh@suse.de> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> --- fs/btrfs/tree-log.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)