| Message ID | 1377852637-4299-1-git-send-email-anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Aug 30, 2013 at 04:50:37PM +0800, Anand Jain wrote: > This fix the regression introduced by 830427d ie. that's "btrfs-progs: avoid write to the disk before sure to create fs" please note that the commit id is not stable and may change during integration branch updates. I was not sure if the patch is all ok and had put it into integration-next branch (that serves me as a unstable area for things that I'd like to look at again). The patch caused Josef some headaches and I've left it out from recent integration branches until the problems are resolved. With the patch in this email you do so, but let me do more testing and then I'll integrate it. > --- a/utils.c > +++ b/utils.c > @@ -1964,3 +1964,32 @@ int scan_for_btrfs(int where, int update_kernel) > +int is_vol_small(char *file) > +{ > + int fd = -1; > + int e; > + struct stat st; > + u64 size; > + > + fd = open(file, O_RDONLY); > + if (fd < 0) > + return -errno; > + if (fstat(fd, &st) < 0) { > + e = -errno; > + close(fd); > + return e; > + } > + size = btrfs_device_size(fd, &st); > + if (size == 0) { > + close(fd); > + return -1; > + } > + if (size < 1024 * 1024 * 1024) { Would be good to use a properly named constant instead of the magic number. thanks, david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/31/2013 07:22 AM, David Sterba wrote: > On Fri, Aug 30, 2013 at 04:50:37PM +0800, Anand Jain wrote: >> This fix the regression introduced by 830427d > > ie. that's > "btrfs-progs: avoid write to the disk before sure to create fs" > > please note that the commit id is not stable and may change during > integration branch updates. > > I was not sure if the patch is all ok and had put it into > integration-next branch (that serves me as a unstable area for things > that I'd like to look at again). The patch caused Josef some headaches > and I've left it out from recent integration branches until the problems > are resolved. With the patch in this email you do so, but let me do more > testing and then I'll integrate it. Thanks for taking care of this David. Let me know if anywhere needs more explanation. I have been introducing series of device related changes in btrfs-progs/mkfs which were/is essential bug fix. Fixes looks complex since originally btrfs-progs/mkfs didn't create and use much of helper functions in this area, now with these fixes its much modular and better. >> --- a/utils.c >> +++ b/utils.c >> @@ -1964,3 +1964,32 @@ int scan_for_btrfs(int where, int update_kernel) >> +int is_vol_small(char *file) >> +{ >> + int fd = -1; >> + int e; >> + struct stat st; >> + u64 size; >> + >> + fd = open(file, O_RDONLY); >> + if (fd < 0) >> + return -errno; >> + if (fstat(fd, &st) < 0) { >> + e = -errno; >> + close(fd); >> + return e; >> + } >> + size = btrfs_device_size(fd, &st); >> + if (size == 0) { >> + close(fd); >> + return -1; >> + } >> + if (size < 1024 * 1024 * 1024) { > > Would be good to use a properly named constant instead of the magic > number. Yeah I notice that, but didn't want to change from the Original. There are other places where this constant is needed as well, will spin a separate patch for that hope that's fine. Thanks Anand > thanks, > david > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Aug 31, 2013 at 01:29:53PM +0800, Anand Jain wrote: > Thanks for taking care of this David. Let me know if anywhere > needs more explanation. > I have been introducing series of device related changes in > btrfs-progs/mkfs which were/is essential bug fix. Fixes looks > complex since originally btrfs-progs/mkfs didn't create and > use much of helper functions in this area, now with these > fixes its much modular and better. Yeah mkfs needs clean ups, thanks for doing that. I'm running btrfs/003 on top of various mkfs option combinations, so far it hasn't blown up at mkfs time, the patches included are btrfs-progs: mkfs should check for small vol well before btrfs-progs: avoid write to the disk before sure to create fs and excluded btrfs-progs: mkfs.c overwrites fd without appropriate close btrfs-progs: Fix: mkfs.c overwrites fd without appropriate close patch david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/mkfs.c b/mkfs.c index 73f5425..5b3b245 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1415,6 +1415,17 @@ int main(int ac, char **av) file = av[optind++]; ssd = is_ssd(file); + if (is_vol_small(file)) { + printf("SMALL VOLUME: forcing mixed metadata/data groups\n"); + mixed = 1; + if (metadata_profile != data_profile) { + if (metadata_profile_opt || data_profile_opt) { + fprintf(stderr, + "With mixed block groups data and metadata profiles must be the same\n"); + exit(1); + } + } + } /* * Set default profiles according to number of added devices. * For mixed groups defaults are single/single. @@ -1435,7 +1446,6 @@ int main(int ac, char **av) BTRFS_BLOCK_GROUP_RAID0 : 0; /* raid0 or single */ } } else { - /* this is not needed but just for completeness */ metadata_profile = 0; data_profile = 0; } @@ -1494,14 +1504,6 @@ int main(int ac, char **av) } - if (mixed) { - if (metadata_profile != data_profile) { - fprintf(stderr, "With mixed block groups data and metadata " - "profiles must be the same\n"); - exit(1); - } - } - blocks[0] = BTRFS_SUPER_INFO_OFFSET; for (i = 1; i < 7; i++) { blocks[i] = BTRFS_SUPER_INFO_OFFSET + 1024 * 1024 + diff --git a/utils.c b/utils.c index de182e0..b039a03 100644 --- a/utils.c +++ b/utils.c @@ -1964,3 +1964,32 @@ int scan_for_btrfs(int where, int update_kernel) } return ret; } + +int is_vol_small(char *file) +{ + int fd = -1; + int e; + struct stat st; + u64 size; + + fd = open(file, O_RDONLY); + if (fd < 0) + return -errno; + if (fstat(fd, &st) < 0) { + e = -errno; + close(fd); + return e; + } + size = btrfs_device_size(fd, &st); + if (size == 0) { + close(fd); + return -1; + } + if (size < 1024 * 1024 * 1024) { + close(fd); + return 1; + } else { + close(fd); + return 0; + } +} diff --git a/utils.h b/utils.h index 4b449b8..eb6fba3 100644 --- a/utils.h +++ b/utils.h @@ -82,4 +82,5 @@ int get_label_mounted(const char *mount_path, char *labelp); int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile, u64 dev_cnt, int mixed, char *estr); int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); +int is_vol_small(char *file); #endif
This fix the regression introduced by 830427d that it no more creates the FS if disk is small and if no mixed option is provided. This patch will bring it to the original design which will force mixed profile when disk is small and go ahead to create the FS. Which also means that before we open the device for the write we should also check if disk is small. v2: fixes the checkpatch.pl warnings Signed-off-by: Anand Jain <anand.jain@oracle.com> --- mkfs.c | 20 +++++++++++--------- utils.c | 29 +++++++++++++++++++++++++++++ utils.h | 1 + 3 files changed, 41 insertions(+), 9 deletions(-)