cifs/client: allow FS_IOC_SETFLAGS to clear compression
Subsystems (2)
PATCH 1/1 cifs/client: allow FS_IOC_SETFLAGS to clear compression
From: Huiwen He <[email protected]>
The CIFS FS_IOC_SETFLAGS path can set FS_COMPR_FL now, but it cannot clear it again. This can be reproduced on a share backed by a filesystem that supports compression, for example btrfs exported by Samba:
[compress_share]
vfs objects = btrfs
$ touch test.bin
$ chattr +c test.bin
$ lsattr test.bin
$ chattr -c test.bin
The final chattr -c fails with EOPNOTSUPP, and leaves the remote object with the compressed attribute still set, because the client always sends FSCTL_SET_COMPRESSION with COMPRESSION_FORMAT_DEFAULT. That is correct for setting FS_COMPR_FL, but clearing FS_COMPR_FL requires sending COMPRESSION_FORMAT_NONE.
Fix this by passing the requested compression state through the set_compression operation. The SMB1 and SMB2 helpers no longer hard-code COMPRESSION_FORMAT_DEFAULT.
When FS_COMPR_FL is set, send COMPRESSION_FORMAT_DEFAULT. When it is cleared, send COMPRESSION_FORMAT_NONE. If the server accepts the request, update the cached FILE_ATTRIBUTE_COMPRESSED bit under i_lock so FS_IOC_GETFLAGS reports the new state.
--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/cifssmb.c | 4 ++-- fs/smb/client/ioctl.c | 46 +++++++++++++++++++++++++++------------ fs/smb/client/smb1ops.c | 5 +++-- fs/smb/client/smb1proto.h | 2 +- fs/smb/client/smb2ops.c | 4 ++-- fs/smb/client/smb2pdu.c | 6 ++--- fs/smb/client/smb2proto.h | 3 ++- 8 files changed, 46 insertions(+), 26 deletions(-)
fs/smb/client/cifsglob.h +1 -1
@@ -425,7 +425,7 @@ struct smb_version_operations {int (*set_file_info)(struct inode *,const char *,FILE_BASIC_INFO *,const unsigned int );int (*set_compression)(const unsigned int ,struct cifs_tcon *, -struct cifsFileInfo *); +struct cifsFileInfo *,__u16 );/* check if we can send an echo or nor */ bool (*can_echo)(struct TCP_Server_Info *);/* send echo request */
fs/smb/client/cifssmb.c +2 -2
@@ -3207,7 +3207,7 @@ struct inode *cifs_create_reparse_inode(struct cifs_open_info_data *data,int CIFSSMB_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -__u16 fid) +__u16 fid,__u16 compression_state) {int rc =0 ;int bytes_returned;
@@ -3222,7 +3222,7 @@ CIFSSMB_set_compression(const unsigned int xid, struct cifs_tcon *tcon,return rc; in_len = rc; - pSMB->compression_state =cpu_to_le16 (COMPRESSION_FORMAT_DEFAULT ); + pSMB->compression_state =cpu_to_le16 (compression_state); pSMB->TotalParameterCount =0 ; pSMB->TotalDataCount =cpu_to_le32 (2 );
fs/smb/client/ioctl.c +32 -14
102 lines not on this page · raw message
fs/smb/client/smb1ops.c +3 -2
@@ -1110,9 +1110,10 @@ smb_set_file_info(struct inode *inode, const char *full_path,static int cifs_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -struct cifsFileInfo *cfile) +struct cifsFileInfo *cfile,__u16 compression_state) { -return CIFSSMB_set_compression (xid, tcon, cfile->fid.netfid); +return CIFSSMB_set_compression (xid, tcon, cfile->fid.netfid, + compression_state); } static int
fs/smb/client/smb1proto.h +1 -1
@@ -117,7 +117,7 @@ struct inode *cifs_create_reparse_inode(struct cifs_open_info_data *data,struct kvec *reparse_iov, struct kvec *xattr_iov);int CIFSSMB_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -__u16 fid); +__u16 fid,__u16 compression_state); int cifs_do_get_acl(const unsigned int xid, struct cifs_tcon *tcon, const unsigned char *searchName, struct posix_acl **acl, const int acl_type, const struct nls_table *nls_codepage,
fs/smb/client/smb2ops.c +2 -2
@@ -2246,10 +2246,10 @@ smb2_duplicate_extents(const unsigned int xid,static int smb2_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -struct cifsFileInfo *cfile) +struct cifsFileInfo *cfile,__u16 compression_state) {return SMB2_set_compression (xid, tcon, cfile->fid.persistent_fid, - cfile->fid.volatile_fid); + cfile->fid.volatile_fid, compression_state); } static int
fs/smb/client/smb2pdu.c +3 -3
@@ -3626,14 +3626,14 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,int SMB2_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid) +u64 persistent_fid,u64 volatile_fid, +__u16 compression_state) {int rc;struct compress_ioctl fsctl_input;char *ret_data =NULL ; - fsctl_input.CompressionState = -cpu_to_le16 (COMPRESSION_FORMAT_DEFAULT ); + fsctl_input.CompressionState =cpu_to_le16 (compression_state); rc = SMB2_ioctl(xid, tcon, persistent_fid, volatile_fid, FSCTL_SET_COMPRESSION,
fs/smb/client/smb2proto.h +2 -1
@@ -216,7 +216,8 @@ int SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb2_file_full_ea_info *buf, int len);int SMB2_set_compression (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid); +u64 persistent_fid,u64 volatile_fid, +__u16 compression_state);int SMB2_oplock_break (const unsigned int xid,struct cifs_tcon *tcon,const u64 persistent_fid,const u64 volatile_fid,__u8 oplock_level);
Signature · 1 line
2.43.0