cifs: add SEEK_HOLE/SEEK_DATA support
Subsystems (2)
PATCH 1/1 cifs: add SEEK_HOLE/SEEK_DATA support
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/cifsfs.c | 9 ++++++++ fs/cifs/cifsglob.h | 2 ++ fs/cifs/smb2ops.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 7 +++++- fs/cifs/smb2pdu.h | 5 +++++ fs/cifs/smbfsctl.h | 2 +- 6 files changed, 88 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +9 -0
@@ -884,6 +884,9 @@ static ssize_t cifs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)static loff_t cifs_llseek (struct file *file,loff_t offset,int whence) { +struct cifsFileInfo *cfile = file->private_data; +struct cifs_tcon *tcon; +/* * whence == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate * the cached file length
@@ -915,6 +918,12 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)if (rc <0 )return (loff_t )rc; } +if (cfile && cfile->tlink) { + tcon =tlink_tcon (cfile->tlink); +if (tcon->ses->server->ops->llseek) +return tcon->ses->server->ops->llseek (file, tcon, + offset, whence); + }return generic_file_llseek (file, offset, whence); }
fs/cifs/cifsglob.h +2 -0
@@ -493,6 +493,8 @@ struct smb_version_operations {char *full_path, umode_t mode, dev_t device_number); +/* version specific llseek implementation */ +loff_t (*llseek)(struct file *,struct cifs_tcon *,loff_t ,int ); };struct smb_version_values {
fs/cifs/smb2ops.c +65 -0
83 lines not on this page · raw message
fs/cifs/smb2pdu.c +6 -1
@@ -2625,7 +2625,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,trace_smb3_fsctl_err (xid, persistent_fid, tcon->tid, ses->Suid,0 , opcode, rc); -if ((rc !=0 ) && (rc != -EINVAL )) { +if ((rc !=0 ) && (rc != -EINVAL ) && (rc != -E2BIG )) {cifs_stats_fail_inc (tcon,SMB2_IOCTL_HE ); goto ioctl_exit; }else if (rc == -EINVAL ) {
@@ -2634,6 +2634,11 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,cifs_stats_fail_inc (tcon,SMB2_IOCTL_HE ); goto ioctl_exit; } + }else if (rc == -E2BIG ) { +if (opcode !=FSCTL_QUERY_ALLOCATED_RANGES ) { +cifs_stats_fail_inc (tcon,SMB2_IOCTL_HE ); + goto ioctl_exit; + } }/* check if caller wants to look at return data or just return rc */
fs/cifs/smb2pdu.h +5 -0
@@ -842,6 +842,11 @@ struct fsctl_get_integrity_information_rsp {__le32 ClusterSizeInBytes; } __packed; +struct file_allocated_range_buffer { +__le64 file_offset; +__le64 length; +} __packed; +/* Integrity ChecksumAlgorithm choices for above */ #define CHECKSUM_TYPE_NONE 0x0000#define CHECKSUM_TYPE_CRC64 0x0002
fs/cifs/smbfsctl.h +1 -1
@@ -103,7 +103,7 @@#define FSCTL_SET_ZERO_ON_DEALLOC 0x00090194/* BB add struct */ #define FSCTL_SET_SHORT_NAME_BEHAVIOR 0x000901B4/* BB add struct */ #define FSCTL_GET_INTEGRITY_INFORMATION 0x0009027C -#define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF/* BB add struct */ +#define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF#define FSCTL_SET_DEFECT_MANAGEMENT 0x00098134/* BB add struct */ #define FSCTL_FILE_LEVEL_TRIM 0x00098208/* BB add struct */ #define FSCTL_DUPLICATE_EXTENTS_TO_FILE 0x00098344
Signature · 1 line
2.13.6