Add get/set compression support to smbinfo
Subsystems (2)
cover Add get/set compression support to smbinfo
Pavel,
Two small patches to add get/set compression support to smbinfo.
The second patch will not work until we get fsctl passthrough support for writing data to the server into cifs.ko.
I sent a patch to cifs.ko to the list.
PATCH 1/2 smbinfo: add GETCOMPRESSION support
--- smbinfo.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ smbinfo.rst | 2 ++ 2 files changed, 50 insertions(+)
smbinfo.c +48 -0
@@ -87,6 +87,8 @@ usage(char *name)" Prints FileStandardInfo for a cifs file.\n" " fsctl-getobjid:\n" " Prints the objectid of the file and GUID of the underlying volume.\n" +" getcompression:\n" +" Prints the compression setting for the file.\n" " list-snapshots:\n" " List the previous versions of the volume that backs this file.\n" " quota:\n"
@@ -243,6 +245,50 @@ fsctlgetobjid(int f) }static void +print_getcompression (uint8_t *sd) +{ +uint16_t u16; + +memcpy (&u16, &sd[0 ],2 ); + u16 =le16toh (u16); + +printf ("Compression: " ); +switch (u16) { +case 0 : +printf ("(0) NONE\n" ); +break ; +case 2 : +printf ("(2) LZNT1\n" ); +break ; +default : +printf ("(%d) UNKNOWN\n" , u16); +break ; + } +} + +static void +getcompression (int f) +{ +struct smb_query_info *qi; + + qi =malloc (sizeof (struct smb_query_info ) +2 ); +memset (qi,0 ,sizeof (qi) +2 ); + qi->info_type =0x9003c ; + qi->file_info_class =0 ; + qi->additional_information =0 ; + qi->input_buffer_length =2 ; + qi->flags =PASSTHRU_FSCTL ; + +if (ioctl (f,CIFS_QUERY_INFO , qi) <0 ) { +fprintf (stderr,"ioctl failed with %s\n" ,strerror (errno)); +exit (1 ); + } +print_getcompression ((uint8_t *)(&qi[1 ])); + +free (qi); +} + +static void print_fileaccessinfo (uint8_t *sd,int type) {uint32_t access_flags;
@@ -1118,6 +1164,8 @@ int main(int argc, char *argv[])filestandardinfo (f); else if (!strcmp(argv[optind], "fsctl-getobjid")) fsctlgetobjid(f); + else if (!strcmp(argv[optind], "getcompression")) + getcompression(f); else if (!strcmp(argv[optind], "list-snapshots")) list_snapshots(f); else if (!strcmp(argv[optind], "quota"))
smbinfo.rst +2 -0
@@ -64,6 +64,8 @@ COMMAND `fsctl-getobjid`: Prints the ObjectID +`getcompression`: Prints the compression setting for the file. + `list-snapshots`: Lists the previous versions of the volume that backs this file `quota`: Print the quota for the volume in the form
Signature · 1 line
2.13.6
Pavel Shilovsky
AppliedRe: [PATCH 1/2] smbinfo: add GETCOMPRESSION support
ср, 10 апр. 2019 г. в 19:23, Ronnie Sahlberg <[email protected]>:
Quoted 94 lines
Signed-off-by Ronnie Sahlberg <[email protected]>--- smbinfo.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ smbinfo.rst | 2 ++ 2 files changed, 50 insertions(+)smbinfo.c +48
-0@@ -87,6 +87,8 @@ usage(char *name)" Prints FileStandardInfo for a cifs file.\n" " fsctl-getobjid:\n" " Prints the objectid of the file and GUID of the underlying volume.\n" +" getcompression:\n" +" Prints the compression setting for the file.\n" " list-snapshots:\n" " List the previous versions of the volume that backs this file.\n" " quota:\n" @@ -243,6 +245,50 @@ fsctlgetobjid(int f) }static void +print_getcompression (uint8_t *sd) +{ +uint16_t u16; + +memcpy (&u16, &sd[0 ],2 ); + u16 =le16toh (u16); + +printf ("Compression: " ); +switch (u16) { +case 0 : +printf ("(0) NONE\n" ); +break ; +case 2 : +printf ("(2) LZNT1\n" ); +break ; +default : +printf ("(%d) UNKNOWN\n" , u16); +break ; + } +} + +static void +getcompression (int f) +{ +struct smb_query_info *qi; + + qi =malloc (sizeof (struct smb_query_info ) +2 ); +memset (qi,0 ,sizeof (qi) +2 ); + qi->info_type =0x9003c ; + qi->file_info_class =0 ; + qi->additional_information =0 ; + qi->input_buffer_length =2 ; + qi->flags =PASSTHRU_FSCTL ; + +if (ioctl (f,CIFS_QUERY_INFO , qi) <0 ) { +fprintf (stderr,"ioctl failed with %s\n" ,strerror (errno)); +exit (1 ); + } +print_getcompression ((uint8_t *)(&qi[1 ])); + +free (qi); +} + +static void print_fileaccessinfo (uint8_t *sd,int type) {uint32_t access_flags;@@ -1118,6 +1164,8 @@ int main(int argc, char *argv[])filestandardinfo (f); else if (!strcmp(argv[optind], "fsctl-getobjid")) fsctlgetobjid(f); + else if (!strcmp(argv[optind], "getcompression")) + getcompression(f); else if (!strcmp(argv[optind], "list-snapshots")) list_snapshots(f); else if (!strcmp(argv[optind], "quota"))smbinfo.rst +2
-1@@ -64,6 +64,8 @@ COMMAND `fsctl-getobjid`: Prints the ObjectID +`getcompression`: Prints the compression setting for the file. + `list-snapshots`: Lists the previous versions of the volume that backs this file `quota`: Print the quota for the volume in the form --
Quoted 2 lines
2.13.6
Merged into "next" branch. Thanks.
--
Best regards,
Pavel Shilovsky
PATCH 2/2 smbinfo: Add SETCOMPRESSION support
In reply to Ronnie Sahlberg--- smbinfo.c | 28 ++++++++++++++++++++++++++++ smbinfo.rst | 5 +++++ 2 files changed, 33 insertions(+)
smbinfo.c +28 -0
@@ -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"))
smbinfo.rst +5 -0
@@ -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
Signature · 1 line
2.13.6
Re: [PATCH 2/2] smbinfo: Add SETCOMPRESSION support
ср, 10 апр. 2019 г. в 19:24, Ronnie Sahlberg <[email protected]>:
Quoted 65 lines
Signed-off-by Ronnie Sahlberg <[email protected]>--- smbinfo.c | 28 ++++++++++++++++++++++++++++ smbinfo.rst | 5 +++++ 2 files changed, 33 insertions(+)smbinfo.c +28
-0@@ -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"))smbinfo.rst +0
-0
smbinfo.rst COMMAND · line 72
Quoted 7 lines
smbinfo.rst +4
-0@@ -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
Re: [PATCH 2/2] smbinfo: Add SETCOMPRESSION support
ср, 17 апр. 2019 г. в 14:47, Pavel Shilovsky <[email protected]>:
Quoted 70 lines
ср, 10 апр. 2019 г. в 19:24, Ronnie Sahlberg <[email protected]>:
Quoted 68 lines
Signed-off-by Ronnie Sahlberg <[email protected]>--- smbinfo.c | 28 ++++++++++++++++++++++++++++ smbinfo.rst | 5 +++++ 2 files changed, 33 insertions(+)smbinfo.c +28
-0@@ -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"))smbinfo.rst +0
-0@@ -66,6 +66,11 @@ COMMAND `getcompression`: Prints the compression setting for the file.
Quoted 9 lines
smbinfo.rst COMMAND · line 72
Quoted 4 lines
smbinfo.rst +4
-0+`setcompression <0|1|2>`: Sets the compression setting for the file. +- 0 No compression +- 1 Default compression +- 2 LZNT10, 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