* [PATCH 2/2] Btrfs: use fastpath in extent state ops as much as possible
2012-05-10 10:10 [PATCH 1/2] Btrfs: fix wrong error returned by adding a device Liu Bo
@ 2012-05-10 10:10 ` Liu Bo
2012-05-11 14:49 ` [PATCH 1/2] Btrfs: fix wrong error returned by adding a device Josef Bacik
1 sibling, 0 replies; 3+ messages in thread
From: Liu Bo @ 2012-05-10 10:10 UTC (permalink / raw)
To: linux-btrfs
Fully utilize our extent state's new helper functions to use
fastpath as much as possible.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
fs/btrfs/extent_io.c | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 198c2ba..f6e9191 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -570,10 +570,8 @@ hit_next:
if (err)
goto out;
if (state->end <= end) {
- clear_state_bit(tree, state, &bits, wake);
- if (last_end == (u64)-1)
- goto out;
- start = last_end + 1;
+ state = clear_state_bit(tree, state, &bits, wake);
+ goto next;
}
goto search_again;
}
@@ -781,7 +779,6 @@ hit_next:
* Just lock what we found and keep going
*/
if (state->start == start && state->end <= end) {
- struct rb_node *next_node;
if (state->state & exclusive_bits) {
*failed_start = state->start;
err = -EEXIST;
@@ -789,20 +786,15 @@ hit_next:
}
set_state_bits(tree, state, &bits);
-
cache_state(state, cached_state);
merge_state(tree, state);
if (last_end == (u64)-1)
goto out;
-
start = last_end + 1;
- next_node = rb_next(&state->rb_node);
- if (next_node && start < end && prealloc && !need_resched()) {
- state = rb_entry(next_node, struct extent_state,
- rb_node);
- if (state->start == start)
- goto hit_next;
- }
+ state = next_state(state);
+ if (start < end && state && state->start == start &&
+ !need_resched())
+ goto hit_next;
goto search_again;
}
@@ -845,6 +837,10 @@ hit_next:
if (last_end == (u64)-1)
goto out;
start = last_end + 1;
+ state = next_state(state);
+ if (start < end && state && state->start == start &&
+ !need_resched())
+ goto hit_next;
}
goto search_again;
}
@@ -994,21 +990,14 @@ hit_next:
* Just lock what we found and keep going
*/
if (state->start == start && state->end <= end) {
- struct rb_node *next_node;
-
set_state_bits(tree, state, &bits);
- clear_state_bit(tree, state, &clear_bits, 0);
+ state = clear_state_bit(tree, state, &clear_bits, 0);
if (last_end == (u64)-1)
goto out;
-
start = last_end + 1;
- next_node = rb_next(&state->rb_node);
- if (next_node && start < end && prealloc && !need_resched()) {
- state = rb_entry(next_node, struct extent_state,
- rb_node);
- if (state->start == start)
- goto hit_next;
- }
+ if (start < end && state && state->start == start &&
+ !need_resched())
+ goto hit_next;
goto search_again;
}
@@ -1042,10 +1031,13 @@ hit_next:
goto out;
if (state->end <= end) {
set_state_bits(tree, state, &bits);
- clear_state_bit(tree, state, &clear_bits, 0);
+ state = clear_state_bit(tree, state, &clear_bits, 0);
if (last_end == (u64)-1)
goto out;
start = last_end + 1;
+ if (start < end && state && state->start == start &&
+ !need_resched())
+ goto hit_next;
}
goto search_again;
}
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] Btrfs: fix wrong error returned by adding a device
2012-05-10 10:10 [PATCH 1/2] Btrfs: fix wrong error returned by adding a device Liu Bo
2012-05-10 10:10 ` [PATCH 2/2] Btrfs: use fastpath in extent state ops as much as possible Liu Bo
@ 2012-05-11 14:49 ` Josef Bacik
1 sibling, 0 replies; 3+ messages in thread
From: Josef Bacik @ 2012-05-11 14:49 UTC (permalink / raw)
To: Liu Bo; +Cc: linux-btrfs
On Thu, May 10, 2012 at 06:10:38PM +0800, Liu Bo wrote:
> Reproduce:
> $ mkfs.btrfs /dev/sdb7
> $ mount /dev/sdb7 /mnt/btrfs -o ro
> $ btrfs dev add /dev/sdb8 /mnt/btrfs
> ERROR: error adding the device '/dev/sdb8' - Invalid argument
>
> Since we mount with readonly options, and /dev/sdb7 is not a seeding one,
> a readonly notification is preferred.
>
> Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
> ---
> fs/btrfs/volumes.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 1411b99..48a06d1 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -1633,7 +1633,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
> int ret = 0;
>
> if ((sb->s_flags & MS_RDONLY) && !root->fs_info->fs_devices->seeding)
> - return -EINVAL;
> + return -EROFS;
>
> bdev = blkdev_get_by_path(device_path, FMODE_WRITE | FMODE_EXCL,
> root->fs_info->bdev_holder);
> --
> 1.6.5.2
>
I've committed these to btrfs-next and added my Reviewed-by. Thanks,
Josef
^ permalink raw reply [flat|nested] 3+ messages in thread