| Message ID | 20191220005848.22327-1-lsahlber@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | smbinfo: remove invalid arguments to ioctl method | expand |
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 >
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
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> --- smbinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)