* [PATCH] btrfs: drop nonvaring variable, instead define it @ 2018-02-26 8:48 Anand Jain 2018-03-05 21:16 ` David Sterba 0 siblings, 1 reply; 4+ messages in thread From: Anand Jain @ 2018-02-26 8:48 UTC (permalink / raw) To: linux-btrfs btrfs_defrag_leaves() has min_trans = 0 which doesn't vary. Defining it makes sense. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/tree-defrag.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index cb6c1ecb3cb0..295c6cf85d0f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -66,6 +66,8 @@ struct btrfs_ordered_sum; #define BTRFS_MAX_LEVEL 8 +#define BTRFS_OLDEST_GENERATION 0ULL + #define BTRFS_COMPAT_EXTENT_TREE_V0 /* diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c index cb65089127cc..c09dbe4bd6e7 100644 --- a/fs/btrfs/tree-defrag.c +++ b/fs/btrfs/tree-defrag.c @@ -39,7 +39,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, int level; int next_key_ret = 0; u64 last_ret = 0; - u64 min_trans = 0; if (root->fs_info->extent_root == root) { /* @@ -81,7 +80,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, path->keep_locks = 1; - ret = btrfs_search_forward(root, &key, path, min_trans); + ret = btrfs_search_forward(root, &key, path, BTRFS_OLDEST_GENERATION); if (ret < 0) goto out; if (ret > 0) { @@ -130,7 +129,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, */ path->slots[1] = btrfs_header_nritems(path->nodes[1]); next_key_ret = btrfs_find_next_key(root, path, &key, 1, - min_trans); + BTRFS_OLDEST_GENERATION); if (next_key_ret == 0) { memcpy(&root->defrag_progress, &key, sizeof(key)); ret = -EAGAIN; -- 2.15.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] btrfs: drop nonvaring variable, instead define it 2018-02-26 8:48 [PATCH] btrfs: drop nonvaring variable, instead define it Anand Jain @ 2018-03-05 21:16 ` David Sterba 2018-03-07 9:29 ` [PATCH v2] " Anand Jain 0 siblings, 1 reply; 4+ messages in thread From: David Sterba @ 2018-03-05 21:16 UTC (permalink / raw) To: Anand Jain; +Cc: linux-btrfs On Mon, Feb 26, 2018 at 04:48:14PM +0800, Anand Jain wrote: > btrfs_defrag_leaves() has min_trans = 0 which doesn't vary. > Defining it makes sense. Defining the oldest transaction makes sense and it can be used in more calls to btrfs_search_forward, please update the patch. ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] btrfs: drop nonvaring variable, instead define it 2018-03-05 21:16 ` David Sterba @ 2018-03-07 9:29 ` Anand Jain 2018-03-07 15:13 ` David Sterba 0 siblings, 1 reply; 4+ messages in thread From: Anand Jain @ 2018-03-07 9:29 UTC (permalink / raw) To: linux-btrfs btrfs_defrag_leaves() declares min_trans = 0; as variable, but doesn't vary it, so define it. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- v2->v1: Use BTRFS_OLDEST_GENERATION at more places where needed. fs/btrfs/ctree.h | 2 ++ fs/btrfs/ioctl.c | 2 +- fs/btrfs/tree-defrag.c | 5 ++--- fs/btrfs/uuid-tree.c | 2 +- fs/btrfs/volumes.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index d688430f9be1..7c408062b6a5 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -66,6 +66,8 @@ struct btrfs_ordered_sum; #define BTRFS_MAX_LEVEL 8 +#define BTRFS_OLDEST_GENERATION 0ULL + #define BTRFS_COMPAT_EXTENT_TREE_V0 /* diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index c5a559105949..ba403c00982c 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2600,7 +2600,7 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) range->len = (u64)-1; } ret = btrfs_defrag_file(file_inode(file), file, - range, 0, 0); + range, BTRFS_OLDEST_GENERATION, 0); if (ret > 0) ret = 0; kfree(range); diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c index cb65089127cc..c09dbe4bd6e7 100644 --- a/fs/btrfs/tree-defrag.c +++ b/fs/btrfs/tree-defrag.c @@ -39,7 +39,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, int level; int next_key_ret = 0; u64 last_ret = 0; - u64 min_trans = 0; if (root->fs_info->extent_root == root) { /* @@ -81,7 +80,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, path->keep_locks = 1; - ret = btrfs_search_forward(root, &key, path, min_trans); + ret = btrfs_search_forward(root, &key, path, BTRFS_OLDEST_GENERATION); if (ret < 0) goto out; if (ret > 0) { @@ -130,7 +129,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, */ path->slots[1] = btrfs_header_nritems(path->nodes[1]); next_key_ret = btrfs_find_next_key(root, path, &key, 1, - min_trans); + BTRFS_OLDEST_GENERATION); if (next_key_ret == 0) { memcpy(&root->defrag_progress, &key, sizeof(key)); ret = -EAGAIN; diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c index 726f928238d0..9916f03430bc 100644 --- a/fs/btrfs/uuid-tree.c +++ b/fs/btrfs/uuid-tree.c @@ -282,7 +282,7 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info, key.offset = 0; again_search_slot: - ret = btrfs_search_forward(root, &key, path, 0); + ret = btrfs_search_forward(root, &key, path, BTRFS_OLDEST_GENERATION); if (ret) { if (ret > 0) ret = 0; diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b4ada8f50f3c..328b97801836 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4206,7 +4206,7 @@ static int btrfs_uuid_scan_kthread(void *data) key.offset = 0; while (1) { - ret = btrfs_search_forward(root, &key, path, 0); + ret = btrfs_search_forward(root, &key, path, BTRFS_OLDEST_GENERATION); if (ret) { if (ret > 0) ret = 0; -- 2.15.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] btrfs: drop nonvaring variable, instead define it 2018-03-07 9:29 ` [PATCH v2] " Anand Jain @ 2018-03-07 15:13 ` David Sterba 0 siblings, 0 replies; 4+ messages in thread From: David Sterba @ 2018-03-07 15:13 UTC (permalink / raw) To: Anand Jain; +Cc: linux-btrfs On Wed, Mar 07, 2018 at 05:29:18PM +0800, Anand Jain wrote: > btrfs_defrag_leaves() declares min_trans = 0; as variable, but > doesn't vary it, so define it. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> > --- > v2->v1: Use BTRFS_OLDEST_GENERATION at more places where needed. I've updated to reflect the change as the new define is the interesting part, removing min_trans in defrag_leaf is only collateral in this case. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-07 15:15 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-02-26 8:48 [PATCH] btrfs: drop nonvaring variable, instead define it Anand Jain 2018-03-05 21:16 ` David Sterba 2018-03-07 9:29 ` [PATCH v2] " Anand Jain 2018-03-07 15:13 ` David Sterba
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).