linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] smbinfo: remove invalid arguments to ioctl method
@ 2019-12-20  0:58 Ronnie Sahlberg
  2019-12-23 20:41 ` Pavel Shilovsky
  0 siblings, 1 reply; 2+ messages in thread
From: Ronnie Sahlberg @ 2019-12-20  0:58 UTC (permalink / raw)
  To: linux-cifs; +Cc: Ronnie Sahlberg

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 smbinfo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smbinfo b/smbinfo
index 1be82c7..ee774d3 100755
--- a/smbinfo
+++ b/smbinfo
@@ -443,7 +443,7 @@ def cmd_filefsfullsizeinfo(args):
     qi = QueryInfoStruct(info_type=0x2, file_info_class=7, input_buffer_length=32)
     try:
         fd = os.open(args.file, os.O_RDONLY)
-        total, caller_avail, actual_avail, sec_per_unit, byte_per_sec = qi.ioctl(fd, CIFS_QUERY_INFO, '<QQQII')
+        total, caller_avail, actual_avail, sec_per_unit, byte_per_sec = qi.ioctl(fd, '<QQQII')
     except Exception as e:
         print("syscall failed: %s"%e)
         return False
@@ -540,7 +540,7 @@ def cmd_getcompression(args):
     qi = QueryInfoStruct(info_type=0x9003c, flags=PASSTHRU_FSCTL, input_buffer_length=2)
     try:
         fd = os.open(args.file, os.O_RDONLY)
-        ctype = qi.ioctl(fd, CIFS_QUERY_INFO, '<H')[0]
+        ctype = qi.ioctl(fd, '<H')[0]
     except Exception as e:
         print("syscall failed: %s"%e)
         return False
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] smbinfo: remove invalid arguments to ioctl method
  2019-12-20  0:58 [PATCH] smbinfo: remove invalid arguments to ioctl method Ronnie Sahlberg
@ 2019-12-23 20:41 ` Pavel Shilovsky
  0 siblings, 0 replies; 2+ messages in thread
From: Pavel Shilovsky @ 2019-12-23 20:41 UTC (permalink / raw)
  To: Ronnie Sahlberg; +Cc: linux-cifs

Merged. Thanks!
--
Best regards,
Pavel Shilovsky

чт, 19 дек. 2019 г. в 16:59, Ronnie Sahlberg <lsahlber@redhat.com>:
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
>  smbinfo | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/smbinfo b/smbinfo
> index 1be82c7..ee774d3 100755
> --- a/smbinfo
> +++ b/smbinfo
> @@ -443,7 +443,7 @@ def cmd_filefsfullsizeinfo(args):
>      qi = QueryInfoStruct(info_type=0x2, file_info_class=7, input_buffer_length=32)
>      try:
>          fd = os.open(args.file, os.O_RDONLY)
> -        total, caller_avail, actual_avail, sec_per_unit, byte_per_sec = qi.ioctl(fd, CIFS_QUERY_INFO, '<QQQII')
> +        total, caller_avail, actual_avail, sec_per_unit, byte_per_sec = qi.ioctl(fd, '<QQQII')
>      except Exception as e:
>          print("syscall failed: %s"%e)
>          return False
> @@ -540,7 +540,7 @@ def cmd_getcompression(args):
>      qi = QueryInfoStruct(info_type=0x9003c, flags=PASSTHRU_FSCTL, input_buffer_length=2)
>      try:
>          fd = os.open(args.file, os.O_RDONLY)
> -        ctype = qi.ioctl(fd, CIFS_QUERY_INFO, '<H')[0]
> +        ctype = qi.ioctl(fd, '<H')[0]
>      except Exception as e:
>          print("syscall failed: %s"%e)
>          return False
> --
> 2.13.6
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-12-23 20:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-20  0:58 [PATCH] smbinfo: remove invalid arguments to ioctl method Ronnie Sahlberg
2019-12-23 20:41 ` Pavel Shilovsky

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).