| Message ID | 4E60D67E.2070903@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 02, 2011 at 09:13:34PM +0800, Jeff Liu wrote: > --- a/ioctl.h > +++ b/ioctl.h > @@ -140,6 +140,8 @@ struct btrfs_ioctl_space_args { > struct btrfs_ioctl_vol_args) > #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \ > struct btrfs_ioctl_vol_args) > +#define BTRFS_IOC_FS_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 5, \ > + struct btrfs_ioctl_fs_label_args) > /* trans start and trans end are dangerous, and only for > * use by applications that know how to avoid the > * resulting deadlocks well, it is an unassigned number, but a newly added features should IMHO allocate greater than current max value, ie over 31 in coordination with https://btrfs.wiki.kernel.org/index.php/Project_ideas#Development_notes.2C_please_read table. 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
? 2011-9-2???11:48? David Sterba ??? > On Fri, Sep 02, 2011 at 09:13:34PM +0800, Jeff Liu wrote: >> --- a/ioctl.h >> +++ b/ioctl.h >> @@ -140,6 +140,8 @@ struct btrfs_ioctl_space_args { >> struct btrfs_ioctl_vol_args) >> #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \ >> struct btrfs_ioctl_vol_args) >> +#define BTRFS_IOC_FS_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 5, \ >> + struct btrfs_ioctl_fs_label_args) >> /* trans start and trans end are dangerous, and only for >> * use by applications that know how to avoid the >> * resulting deadlocks > > well, it is an unassigned number, but a newly added features should IMHO > allocate greater than current max value, ie over 31 in coordination with > > https://btrfs.wiki.kernel.org/index.php/Project_ideas#Development_notes.2C_please_read > > table. It sounds reasonable to allocate a greater value, could anyone please confirm it? Hi Zefan, What's your ioctl range for online fsck? Thanks, -Jeff > > > 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 09/05/2011 01:03 AM, Hugo Mills wrote: > On Sat, Sep 03, 2011 at 11:11:36AM +0800, Jeff liu wrote: >> ? 2011-9-2???11:48? David Sterba ??? >>> On Fri, Sep 02, 2011 at 09:13:34PM +0800, Jeff Liu wrote: >>>> --- a/ioctl.h >>>> +++ b/ioctl.h >>>> @@ -140,6 +140,8 @@ struct btrfs_ioctl_space_args { >>>> struct btrfs_ioctl_vol_args) >>>> #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \ >>>> struct btrfs_ioctl_vol_args) >>>> +#define BTRFS_IOC_FS_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 5, \ >>>> + struct btrfs_ioctl_fs_label_args) >>>> /* trans start and trans end are dangerous, and only for >>>> * use by applications that know how to avoid the >>>> * resulting deadlocks >>> well, it is an unassigned number, but a newly added features should IMHO >>> allocate greater than current max value, ie over 31 in coordination with >>> >>> https://btrfs.wiki.kernel.org/index.php/Project_ideas#Development_notes.2C_please_read >>> >>> table. >> It sounds reasonable to allocate a greater value, could anyone please confirm it? > I'd just take number 50 for yours -- Li can update his patches > later. Thank you, I'll post a patch for this change later. -Jeff > Hugo. > >> What's your ioctl range for online fsck? -- 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/btrfs.c b/btrfs.c index 46314cf..6d414f1 100644 --- a/btrfs.c +++ b/btrfs.c @@ -108,11 +108,10 @@ static struct Command commands[] = { "device delete", "<dev> [<dev>..] <path>\n" "Remove a device from a filesystem." }, - /* coming soon - { 2, "filesystem label", "<label> <path>\n" + { do_set_label, 2, + "filesystem label", "<label> <path>\n" "Set the label of a filesystem" - } - */ + }, { 0, 0 , 0 } }; diff --git a/btrfs_cmds.c b/btrfs_cmds.c index 8031c58..2a879c0 100644 --- a/btrfs_cmds.c +++ b/btrfs_cmds.c @@ -834,6 +834,40 @@ int do_set_default_subvol(int nargs, char **argv) return 0; } +int do_set_label(int nargs, char **argv) +{ + int fd, ret; + char *path = argv[2]; + char *label = parse_label(argv[1]); + size_t len = strlen(label); + struct btrfs_ioctl_fs_label_args label_args; + + if (len == 0 || len >= BTRFS_LABEL_SIZE) { + fprintf(stderr, "ERROR: label length too long ('%s')\n", + label); + free(label); + return 14; + } + + fd = open_file_or_dir(path); + if (fd < 0) { + free(label); + fprintf(stderr, "ERROR: can't access to '%s'\n", path); + return 12; + } + + strcpy(label_args.label, label); + ret = ioctl(fd, BTRFS_IOC_FS_SETLABEL, &label_args); + close(fd); + free(label); + if(ret < 0) { + fprintf(stderr, "ERROR: unable to set a new label\n"); + return 30; + } + + return 0; +} + int do_df_filesystem(int nargs, char **argv) { struct btrfs_ioctl_space_args *sargs; diff --git a/btrfs_cmds.h b/btrfs_cmds.h index 7bde191..29ded22 100644 --- a/btrfs_cmds.h +++ b/btrfs_cmds.h @@ -32,3 +32,4 @@ int list_subvols(int fd); int do_df_filesystem(int nargs, char **argv); int find_updated_files(int fd, u64 root_id, u64 oldest_gen); int do_find_newer(int argc, char **argv); +int do_set_label(int argc, char **argv); diff --git a/ctree.h b/ctree.h index b79e238..745879b 100644 --- a/ctree.h +++ b/ctree.h @@ -345,6 +345,10 @@ struct btrfs_super_block { u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE]; } __attribute__ ((__packed__)); +struct btrfs_ioctl_fs_label_args { + char label[BTRFS_LABEL_SIZE]; +}; + /* * Compat flags that we support. If any incompat flags are set other than the * ones specified below then we will fail to mount diff --git a/ioctl.h b/ioctl.h index 776d7a9..98acd63 100644 --- a/ioctl.h +++ b/ioctl.h @@ -140,6 +140,8 @@ struct btrfs_ioctl_space_args { struct btrfs_ioctl_vol_args) #define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \ struct btrfs_ioctl_vol_args) +#define BTRFS_IOC_FS_SETLABEL _IOW(BTRFS_IOCTL_MAGIC, 5, \ + struct btrfs_ioctl_fs_label_args) /* trans start and trans end are dangerous, and only for * use by applications that know how to avoid the * resulting deadlocks diff --git a/mkfs.c b/mkfs.c index 1598aae..93c1636 100644 --- a/mkfs.c +++ b/mkfs.c @@ -303,25 +303,6 @@ static u64 parse_profile(char *s) return 0; } -static char *parse_label(char *input) -{ - int i; - int len = strlen(input); - - if (len >= BTRFS_LABEL_SIZE) { - fprintf(stderr, "Label %s is too long (max %d)\n", input, - BTRFS_LABEL_SIZE - 1); - exit(1); - } - for (i = 0; i < len; i++) { - if (input[i] == '/' || input[i] == '\\') { - fprintf(stderr, "invalid label %s\n", input); - exit(1); - } - } - return strdup(input); -} - static struct option long_options[] = { { "alloc-start", 1, NULL, 'A'}, { "byte-count", 1, NULL, 'b' }, diff --git a/utils.c b/utils.c index fd894f3..5d77503 100644 --- a/utils.c +++ b/utils.c @@ -993,3 +993,21 @@ char *pretty_sizes(u64 size) return pretty; } +char *parse_label(const char *input) +{ + int i; + int len = strlen(input); + + if (len >= BTRFS_LABEL_SIZE) { + fprintf(stderr, "Label %s is too long (max %d)\n", input, + BTRFS_LABEL_SIZE - 1); + exit(1); + } + for (i = 0; i < len; i++) { + if (input[i] == '/' || input[i] == '\\') { + fprintf(stderr, "invalid label %s\n", input); + exit(1); + } + } + return strdup(input); +} diff --git a/utils.h b/utils.h index 9dce5b0..9212a75 100644 --- a/utils.h +++ b/utils.h @@ -40,4 +40,5 @@ int check_mounted(const char *devicename); int btrfs_device_already_in_root(struct btrfs_root *root, int fd, int super_offset); char *pretty_sizes(u64 size); +char *parse_label(const char *); #endif