* [PATCH v2 1/3] btrfs-progs: don't replicate the stripe_len defines
@ 2013-12-17 2:33 Anand Jain
2013-12-17 2:33 ` [PATCH v2 2/3] btrfs-progs: use stripe_len define here Anand Jain
2013-12-17 2:33 ` [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device Anand Jain
0 siblings, 2 replies; 6+ messages in thread
From: Anand Jain @ 2013-12-17 2:33 UTC (permalink / raw)
To: linux-btrfs
a clean up patch, the BTRFS_STRIPE_LEN is been duplicated across
btrfs-progs, the kernel defines it in volume.h so do the same
for progs.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: commit update
---
btrfs-convert.c | 19 +++++++++----------
chunk-recover.c | 1 -
cmds-chunk.c | 1 -
volumes.h | 2 ++
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/btrfs-convert.c b/btrfs-convert.c
index ae10eed..65fe707 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -43,7 +43,6 @@
#include <ext2fs/ext2_ext_attr.h>
#define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
-#define STRIPE_LEN (64 * 1024)
#define EXT2_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
/*
@@ -134,11 +133,11 @@ static int cache_free_extents(struct btrfs_root *root, ext2_filsys ext2_fs)
for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
bytenr = btrfs_sb_offset(i);
- bytenr &= ~((u64)STRIPE_LEN - 1);
+ bytenr &= ~((u64)BTRFS_STRIPE_LEN - 1);
if (bytenr >= blocksize * ext2_fs->super->s_blocks_count)
break;
clear_extent_dirty(&root->fs_info->free_space_cache, bytenr,
- bytenr + STRIPE_LEN - 1, 0);
+ bytenr + BTRFS_STRIPE_LEN - 1, 0);
}
clear_extent_dirty(&root->fs_info->free_space_cache,
@@ -207,9 +206,9 @@ static int intersect_with_sb(u64 bytenr, u64 num_bytes)
for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
offset = btrfs_sb_offset(i);
- offset &= ~((u64)STRIPE_LEN - 1);
+ offset &= ~((u64)BTRFS_STRIPE_LEN - 1);
- if (bytenr < offset + STRIPE_LEN &&
+ if (bytenr < offset + BTRFS_STRIPE_LEN &&
bytenr + num_bytes > offset)
return 1;
}
@@ -450,8 +449,8 @@ static int block_iterate_proc(ext2_filsys ext2_fs,
}
if (sb_region) {
- bytenr += STRIPE_LEN - 1;
- bytenr &= ~((u64)STRIPE_LEN - 1);
+ bytenr += BTRFS_STRIPE_LEN - 1;
+ bytenr &= ~((u64)BTRFS_STRIPE_LEN - 1);
} else {
cache = btrfs_lookup_block_group(root->fs_info, bytenr);
BUG_ON(!cache);
@@ -1523,7 +1522,7 @@ static int create_chunk_mapping(struct btrfs_trans_handle *trans,
btrfs_set_stack_chunk_length(&chunk, cache->key.offset);
btrfs_set_stack_chunk_owner(&chunk,
extent_root->root_key.objectid);
- btrfs_set_stack_chunk_stripe_len(&chunk, STRIPE_LEN);
+ btrfs_set_stack_chunk_stripe_len(&chunk, BTRFS_STRIPE_LEN);
btrfs_set_stack_chunk_type(&chunk, cache->flags);
btrfs_set_stack_chunk_io_align(&chunk, device->io_align);
btrfs_set_stack_chunk_io_width(&chunk, device->io_width);
@@ -2098,10 +2097,10 @@ static int cleanup_sys_chunk(struct btrfs_root *fs_root,
}
for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
offset = btrfs_sb_offset(i);
- offset &= ~((u64)STRIPE_LEN - 1);
+ offset &= ~((u64)BTRFS_STRIPE_LEN - 1);
ret = relocate_extents_range(fs_root, ext2_root,
- offset, offset + STRIPE_LEN);
+ offset, offset + BTRFS_STRIPE_LEN);
if (ret)
goto fail;
}
diff --git a/chunk-recover.c b/chunk-recover.c
index bcde39e..b072ba6 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -41,7 +41,6 @@
#include "btrfsck.h"
#include "commands.h"
-#define BTRFS_STRIPE_LEN (64 * 1024)
#define BTRFS_NUM_MIRRORS 2
struct recover_control {
diff --git a/cmds-chunk.c b/cmds-chunk.c
index 4d7fce0..348229c 100644
--- a/cmds-chunk.c
+++ b/cmds-chunk.c
@@ -42,7 +42,6 @@
#include "commands.h"
#define BTRFS_CHUNK_TREE_REBUILD_ABORTED -7500
-#define BTRFS_STRIPE_LEN (64 * 1024)
#define BTRFS_NUM_MIRRORS 2
struct recover_control {
diff --git a/volumes.h b/volumes.h
index 2802cb0..b1ff3d0 100644
--- a/volumes.h
+++ b/volumes.h
@@ -19,6 +19,8 @@
#ifndef __BTRFS_VOLUMES_
#define __BTRFS_VOLUMES_
+#define BTRFS_STRIPE_LEN (64 * 1024)
+
struct btrfs_device {
struct list_head dev_list;
struct btrfs_root *dev_root;
--
1.8.1.164.g2d0029e
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] btrfs-progs: use stripe_len define here
2013-12-17 2:33 [PATCH v2 1/3] btrfs-progs: don't replicate the stripe_len defines Anand Jain
@ 2013-12-17 2:33 ` Anand Jain
2013-12-17 2:33 ` [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device Anand Jain
1 sibling, 0 replies; 6+ messages in thread
From: Anand Jain @ 2013-12-17 2:33 UTC (permalink / raw)
To: linux-btrfs
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: commit update
---
btrfs-convert.c | 2 +-
btrfs-image.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/btrfs-convert.c b/btrfs-convert.c
index 65fe707..df20c15 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -1715,7 +1715,7 @@ static int prepare_system_chunk_sb(struct btrfs_super_block *super)
btrfs_set_stack_chunk_length(chunk, btrfs_super_total_bytes(super));
btrfs_set_stack_chunk_owner(chunk, BTRFS_EXTENT_TREE_OBJECTID);
- btrfs_set_stack_chunk_stripe_len(chunk, 64 * 1024);
+ btrfs_set_stack_chunk_stripe_len(chunk, BTRFS_STRIPE_LEN);
btrfs_set_stack_chunk_type(chunk, BTRFS_BLOCK_GROUP_SYSTEM);
btrfs_set_stack_chunk_io_align(chunk, sectorsize);
btrfs_set_stack_chunk_io_width(chunk, sectorsize);
diff --git a/btrfs-image.c b/btrfs-image.c
index 7bcfc06..1b2831a 100644
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -1350,7 +1350,7 @@ static void update_super_old(u8 *buffer)
btrfs_set_stack_chunk_length(chunk, (u64)-1);
btrfs_set_stack_chunk_owner(chunk, BTRFS_EXTENT_TREE_OBJECTID);
- btrfs_set_stack_chunk_stripe_len(chunk, 64 * 1024);
+ btrfs_set_stack_chunk_stripe_len(chunk, BTRFS_STRIPE_LEN);
btrfs_set_stack_chunk_type(chunk, BTRFS_BLOCK_GROUP_SYSTEM);
btrfs_set_stack_chunk_io_align(chunk, sectorsize);
btrfs_set_stack_chunk_io_width(chunk, sectorsize);
--
1.8.1.164.g2d0029e
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device
2013-12-17 2:33 [PATCH v2 1/3] btrfs-progs: don't replicate the stripe_len defines Anand Jain
2013-12-17 2:33 ` [PATCH v2 2/3] btrfs-progs: use stripe_len define here Anand Jain
@ 2013-12-17 2:33 ` Anand Jain
2013-12-17 8:01 ` Stefan Behrens
1 sibling, 1 reply; 6+ messages in thread
From: Anand Jain @ 2013-12-17 2:33 UTC (permalink / raw)
To: linux-btrfs
this patch will handle the strerror reporting of the error instead of
printing errno, and also replaced the BUG_ON with the error handling
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: commit update
---
cmds-device.c | 7 +++----
cmds-replace.c | 10 ++++------
mkfs.c | 9 ++++++++-
utils.c | 30 +++++++++++++++++++-----------
4 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/cmds-device.c b/cmds-device.c
index bc4a8dc..ada0bcd 100644
--- a/cmds-device.c
+++ b/cmds-device.c
@@ -111,13 +111,11 @@ static int cmd_add_dev(int argc, char **argv)
res = btrfs_prepare_device(devfd, argv[i], 1, &dev_block_count,
0, &mixed, discard);
+ close(devfd);
if (res) {
- fprintf(stderr, "ERROR: Unable to init '%s'\n", argv[i]);
- close(devfd);
ret++;
- continue;
+ goto error_out;
}
- close(devfd);
strncpy_null(ioctl_args.name, argv[i]);
res = ioctl(fdmnt, BTRFS_IOC_ADD_DEV, &ioctl_args);
@@ -130,6 +128,7 @@ static int cmd_add_dev(int argc, char **argv)
}
+error_out:
close_file_or_dir(fdmnt, dirstream);
return !!ret;
}
diff --git a/cmds-replace.c b/cmds-replace.c
index d9b0940..8160107 100644
--- a/cmds-replace.c
+++ b/cmds-replace.c
@@ -276,13 +276,11 @@ static int cmd_start_replace(int argc, char **argv)
}
strncpy((char *)start_args.start.tgtdev_name, dstdev,
BTRFS_DEVICE_PATH_NAME_MAX);
- if (btrfs_prepare_device(fddstdev, dstdev, 1, &dstdev_block_count, 0,
- &mixed, 0)) {
- fprintf(stderr, "Error: Failed to prepare device '%s'\n",
- dstdev);
- goto leave_with_error;
- }
+ ret = btrfs_prepare_device(fddstdev, dstdev, 1, &dstdev_block_count, 0,
+ &mixed, 0);
close(fddstdev);
+ if (ret)
+ goto leave_with_error;
fddstdev = -1;
dev_replace_handle_sigint(fdmnt);
diff --git a/mkfs.c b/mkfs.c
index 33369f9..18df087 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1446,6 +1446,10 @@ int main(int ac, char **av)
first_file = file;
ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count,
block_count, &mixed, discard);
+ if (ret) {
+ close(fd);
+ exit(1);
+ }
if (block_count && block_count > dev_block_count) {
fprintf(stderr, "%s is smaller than requested size\n", file);
exit(1);
@@ -1553,8 +1557,11 @@ int main(int ac, char **av)
}
ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count,
block_count, &mixed, discard);
+ if (ret) {
+ close(fd);
+ exit(1);
+ }
mixed = old_mixed;
- BUG_ON(ret);
ret = btrfs_add_to_fsid(trans, root, fd, file, dev_block_count,
sectorsize, sectorsize, sectorsize);
diff --git a/utils.c b/utils.c
index f499023..85b967b 100644
--- a/utils.c
+++ b/utils.c
@@ -581,13 +581,13 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
ret = fstat(fd, &st);
if (ret < 0) {
fprintf(stderr, "unable to stat %s\n", file);
- exit(1);
+ return 1;
}
block_count = btrfs_device_size(fd, &st);
if (block_count == 0) {
fprintf(stderr, "unable to find %s size\n", file);
- exit(1);
+ return 1;
}
if (max_block_count)
block_count = min(block_count, max_block_count);
@@ -612,26 +612,34 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
}
ret = zero_dev_start(fd);
- if (ret) {
- fprintf(stderr, "failed to zero device start %d\n", ret);
- exit(1);
- }
+ if (ret)
+ goto zero_dev_error;
for (i = 0 ; i < BTRFS_SUPER_MIRROR_MAX; i++) {
bytenr = btrfs_sb_offset(i);
if (bytenr >= block_count)
break;
- zero_blocks(fd, bytenr, BTRFS_SUPER_INFO_SIZE);
+ ret = zero_blocks(fd, bytenr, BTRFS_SUPER_INFO_SIZE);
+ if (ret)
+ goto zero_dev_error;
}
if (zero_end) {
ret = zero_dev_end(fd, block_count);
- if (ret) {
- fprintf(stderr, "failed to zero device end %d\n", ret);
- exit(1);
- }
+ if (ret)
+ goto zero_dev_error;
}
*block_count_ret = block_count;
+
+zero_dev_error:
+ if (ret) {
+ ret < 0 ?
+ fprintf(stderr, "ERROR: failed to zero device start '%s' - %s\n",
+ file, strerror(-ret)) :
+ fprintf(stderr, "ERROR: failed to zero device start '%s' - %d\n",
+ file, ret);
+ return 1;
+ }
return 0;
}
--
1.8.1.164.g2d0029e
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device
2013-12-17 2:33 ` [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device Anand Jain
@ 2013-12-17 8:01 ` Stefan Behrens
2013-12-17 8:37 ` Anand Jain
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Behrens @ 2013-12-17 8:01 UTC (permalink / raw)
To: Anand Jain, linux-btrfs
On Tue, 17 Dec 2013 10:33:36 +0800, Anand Jain wrote:
> this patch will handle the strerror reporting of the error instead of
> printing errno, and also replaced the BUG_ON with the error handling
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
> v2: commit update
> ---
> cmds-device.c | 7 +++----
> cmds-replace.c | 10 ++++------
> mkfs.c | 9 ++++++++-
> utils.c | 30 +++++++++++++++++++-----------
> 4 files changed, 34 insertions(+), 22 deletions(-)
>
[...]
> diff --git a/cmds-replace.c b/cmds-replace.c
> index d9b0940..8160107 100644
> --- a/cmds-replace.c
> +++ b/cmds-replace.c
> @@ -276,13 +276,11 @@ static int cmd_start_replace(int argc, char **argv)
> }
> strncpy((char *)start_args.start.tgtdev_name, dstdev,
> BTRFS_DEVICE_PATH_NAME_MAX);
> - if (btrfs_prepare_device(fddstdev, dstdev, 1, &dstdev_block_count, 0,
> - &mixed, 0)) {
> - fprintf(stderr, "Error: Failed to prepare device '%s'\n",
> - dstdev);
> - goto leave_with_error;
> - }
> + ret = btrfs_prepare_device(fddstdev, dstdev, 1, &dstdev_block_count, 0,
> + &mixed, 0);
> close(fddstdev);
> + if (ret)
> + goto leave_with_error;
> fddstdev = -1;
You change the code to call close(fddstdev) twice.
[...]
> +zero_dev_error:
> + if (ret) {
> + ret < 0 ?
> + fprintf(stderr, "ERROR: failed to zero device start '%s' - %s\n",
> + file, strerror(-ret)) :
> + fprintf(stderr, "ERROR: failed to zero device start '%s' - %d\n",
> + file, ret);
This is not funny.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device
2013-12-17 8:01 ` Stefan Behrens
@ 2013-12-17 8:37 ` Anand Jain
2013-12-17 14:18 ` David Sterba
0 siblings, 1 reply; 6+ messages in thread
From: Anand Jain @ 2013-12-17 8:37 UTC (permalink / raw)
To: Stefan Behrens, linux-btrfs
>> + ret = btrfs_prepare_device(fddstdev, dstdev, 1, &dstdev_block_count, 0,
>> + &mixed, 0);
>> close(fddstdev);
>> + if (ret)
>> + goto leave_with_error;
>> fddstdev = -1;
yeah moved this 3 lines up. thanks.
> You change the code to call close(fddstdev) twice.
>
> [...]
>> +zero_dev_error:
>> + if (ret) {
>> + ret < 0 ?
>> + fprintf(stderr, "ERROR: failed to zero device start '%s' - %s\n",
>> + file, strerror(-ret)) :
>> + fprintf(stderr, "ERROR: failed to zero device start '%s' - %d\n",
>> + file, ret);
>
> This is not funny.
hmm. I am not sure what you mean ?
Thanks, Anand
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device
2013-12-17 8:37 ` Anand Jain
@ 2013-12-17 14:18 ` David Sterba
0 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2013-12-17 14:18 UTC (permalink / raw)
To: Anand Jain; +Cc: Stefan Behrens, linux-btrfs
On Tue, Dec 17, 2013 at 04:37:35PM +0800, Anand Jain wrote:
> >>+zero_dev_error:
> >>+ if (ret) {
> >>+ ret < 0 ?
> >>+ fprintf(stderr, "ERROR: failed to zero device start '%s' - %s\n",
> >>+ file, strerror(-ret)) :
> >>+ fprintf(stderr, "ERROR: failed to zero device start '%s' - %d\n",
> >>+ file, ret);
> >
> >This is not funny.
>
> hmm. I am not sure what you mean ?
It's rather obfuscated, though it's a valid C. No need to minimize the
source line count but the time to understand them.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-17 14:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-17 2:33 [PATCH v2 1/3] btrfs-progs: don't replicate the stripe_len defines Anand Jain
2013-12-17 2:33 ` [PATCH v2 2/3] btrfs-progs: use stripe_len define here Anand Jain
2013-12-17 2:33 ` [PATCH v2 3/3] btrfs-progs: handle error in the btrfs_prepare_device Anand Jain
2013-12-17 8:01 ` Stefan Behrens
2013-12-17 8:37 ` Anand Jain
2013-12-17 14:18 ` 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).