| Message ID | 20190411022307.26463-3-lsahlber@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add get/set compression support to smbinfo | expand |
ср, 10 апр. 2019 г. в 19:24, Ronnie Sahlberg <lsahlber@redhat.com>: > > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> > --- > smbinfo.c | 28 ++++++++++++++++++++++++++++ > smbinfo.rst | 5 +++++ > 2 files changed, 33 insertions(+) > > diff --git a/smbinfo.c b/smbinfo.c > index db569b2..b87cca4 100644 > --- a/smbinfo.c > +++ b/smbinfo.c > @@ -89,6 +89,8 @@ usage(char *name) > " Prints the objectid of the file and GUID of the underlying volume.\n" > " getcompression:\n" > " Prints the compression setting for the file.\n" > + " setcompression <0|1|2>:\n" > + " Sets the compression level for the file.\n" > " list-snapshots:\n" > " List the previous versions of the volume that backs this file.\n" > " quota:\n" > @@ -289,6 +291,30 @@ getcompression(int f) > } > > static void > +setcompression(int f, uint16_t level) > +{ > + struct smb_query_info *qi; > + > + qi = malloc(sizeof(struct smb_query_info) + 2); > + memset(qi, 0, sizeof(qi) + 2); > + qi->info_type = 0x9c040; > + qi->file_info_class = 0; > + qi->additional_information = 0; > + qi->output_buffer_length = 2; > + qi->flags = PASSTHRU_FSCTL; > + > + level = htole16(level); > + memcpy(&qi[1], &level, 2); > + > + if (ioctl(f, CIFS_QUERY_INFO, qi) < 0) { > + fprintf(stderr, "ioctl failed with %s\n", strerror(errno)); > + exit(1); > + } > + > + free(qi); > +} > + > +static void > print_fileaccessinfo(uint8_t *sd, int type) > { > uint32_t access_flags; > @@ -1166,6 +1192,8 @@ int main(int argc, char *argv[]) > fsctlgetobjid(f); > else if (!strcmp(argv[optind], "getcompression")) > getcompression(f); > + else if (!strcmp(argv[optind], "setcompression")) > + setcompression(f, strtol(argv[optind + 2], NULL, 10)); > else if (!strcmp(argv[optind], "list-snapshots")) > list_snapshots(f); > else if (!strcmp(argv[optind], "quota")) > diff --git a/smbinfo.rst b/smbinfo.rst > index ca99b07..af97b7f 100644 > --- a/smbinfo.rst > +++ b/smbinfo.rst > @@ -66,6 +66,11 @@ COMMAND > > `getcompression`: Prints the compression setting for the file. > > +`setcompression <0|1|2>`: Sets the compression setting for the file. > +- 0 No compression > +- 1 Default compression > +- 2 LZNT1 0, 1 and 2 don't look obvious, how about "no", "default", "lznt1"? -- Best regards, Pavel Shilovsky
ср, 17 апр. 2019 г. в 14:47, Pavel Shilovsky <piastryyy@gmail.com>: > > ср, 10 апр. 2019 г. в 19:24, Ronnie Sahlberg <lsahlber@redhat.com>: > > > > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> > > --- > > smbinfo.c | 28 ++++++++++++++++++++++++++++ > > smbinfo.rst | 5 +++++ > > 2 files changed, 33 insertions(+) > > > > diff --git a/smbinfo.c b/smbinfo.c > > index db569b2..b87cca4 100644 > > --- a/smbinfo.c > > +++ b/smbinfo.c > > @@ -89,6 +89,8 @@ usage(char *name) > > " Prints the objectid of the file and GUID of the underlying volume.\n" > > " getcompression:\n" > > " Prints the compression setting for the file.\n" > > + " setcompression <0|1|2>:\n" > > + " Sets the compression level for the file.\n" > > " list-snapshots:\n" > > " List the previous versions of the volume that backs this file.\n" > > " quota:\n" > > @@ -289,6 +291,30 @@ getcompression(int f) > > } > > > > static void > > +setcompression(int f, uint16_t level) > > +{ > > + struct smb_query_info *qi; > > + > > + qi = malloc(sizeof(struct smb_query_info) + 2); > > + memset(qi, 0, sizeof(qi) + 2); > > + qi->info_type = 0x9c040; > > + qi->file_info_class = 0; > > + qi->additional_information = 0; > > + qi->output_buffer_length = 2; > > + qi->flags = PASSTHRU_FSCTL; > > + > > + level = htole16(level); > > + memcpy(&qi[1], &level, 2); > > + > > + if (ioctl(f, CIFS_QUERY_INFO, qi) < 0) { > > + fprintf(stderr, "ioctl failed with %s\n", strerror(errno)); > > + exit(1); > > + } > > + > > + free(qi); > > +} > > + > > +static void > > print_fileaccessinfo(uint8_t *sd, int type) > > { > > uint32_t access_flags; > > @@ -1166,6 +1192,8 @@ int main(int argc, char *argv[]) > > fsctlgetobjid(f); > > else if (!strcmp(argv[optind], "getcompression")) > > getcompression(f); > > + else if (!strcmp(argv[optind], "setcompression")) > > + setcompression(f, strtol(argv[optind + 2], NULL, 10)); > > else if (!strcmp(argv[optind], "list-snapshots")) > > list_snapshots(f); > > else if (!strcmp(argv[optind], "quota")) > > diff --git a/smbinfo.rst b/smbinfo.rst > > index ca99b07..af97b7f 100644 > > --- a/smbinfo.rst > > +++ b/smbinfo.rst > > @@ -66,6 +66,11 @@ COMMAND > > > > `getcompression`: Prints the compression setting for the file. > > > > +`setcompression <0|1|2>`: Sets the compression setting for the file. > > +- 0 No compression > > +- 1 Default compression > > +- 2 LZNT1 > > 0, 1 and 2 don't look obvious, how about "no", "default", "lznt1"? > -- > Best regards, > Pavel Shilovsky I tried it and I think the syntax is strange: smbinfo setcompression /mnt/test/file 1 How about this: smbinfo setcompression [-c <0|1|2>] <filename> ? -c would be 1 by default, so smbinfo setcompression <filename> will set a default compression. Also as I mentioned before specifying "no", "default" and "lznt1" looks better to me but I am ok with integers too. -- Best regards, Pavel Shilovsky
diff --git a/smbinfo.c b/smbinfo.c index db569b2..b87cca4 100644 --- a/smbinfo.c +++ b/smbinfo.c @@ -89,6 +89,8 @@ usage(char *name) " Prints the objectid of the file and GUID of the underlying volume.\n" " getcompression:\n" " Prints the compression setting for the file.\n" + " setcompression <0|1|2>:\n" + " Sets the compression level for the file.\n" " list-snapshots:\n" " List the previous versions of the volume that backs this file.\n" " quota:\n" @@ -289,6 +291,30 @@ getcompression(int f) } static void +setcompression(int f, uint16_t level) +{ + struct smb_query_info *qi; + + qi = malloc(sizeof(struct smb_query_info) + 2); + memset(qi, 0, sizeof(qi) + 2); + qi->info_type = 0x9c040; + qi->file_info_class = 0; + qi->additional_information = 0; + qi->output_buffer_length = 2; + qi->flags = PASSTHRU_FSCTL; + + level = htole16(level); + memcpy(&qi[1], &level, 2); + + if (ioctl(f, CIFS_QUERY_INFO, qi) < 0) { + fprintf(stderr, "ioctl failed with %s\n", strerror(errno)); + exit(1); + } + + free(qi); +} + +static void print_fileaccessinfo(uint8_t *sd, int type) { uint32_t access_flags; @@ -1166,6 +1192,8 @@ int main(int argc, char *argv[]) fsctlgetobjid(f); else if (!strcmp(argv[optind], "getcompression")) getcompression(f); + else if (!strcmp(argv[optind], "setcompression")) + setcompression(f, strtol(argv[optind + 2], NULL, 10)); else if (!strcmp(argv[optind], "list-snapshots")) list_snapshots(f); else if (!strcmp(argv[optind], "quota")) diff --git a/smbinfo.rst b/smbinfo.rst index ca99b07..af97b7f 100644 --- a/smbinfo.rst +++ b/smbinfo.rst @@ -66,6 +66,11 @@ COMMAND `getcompression`: Prints the compression setting for the file. +`setcompression <0|1|2>`: Sets the compression setting for the file. +- 0 No compression +- 1 Default compression +- 2 LZNT1 + `list-snapshots`: Lists the previous versions of the volume that backs this file `quota`: Print the quota for the volume in the form
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> --- smbinfo.c | 28 ++++++++++++++++++++++++++++ smbinfo.rst | 5 +++++ 2 files changed, 33 insertions(+)