cifs: add fiemap support
Subsystems (2)
cover cifs: add fiemap support
Steve, Pavel,
Please find a small patch that adds fiemap support to smb2+ This patch will conflict with the previous SEEK_HOLE/DATA patch but please disregard that patch for a now. There are things we need to think about with punch-hole and seek/data/hole first.
I will send a separate email about that.
With this patch, filefrag -v will work against a windows16 server with sparse files with holes. This also allows the 'cp' commands to operate much more efficient if copying large sparse files from a smb2+ share.
PATCH 1/1 cifs: add fiemap support
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/cifsfs.c | 1 + fs/cifs/cifsfs.h | 2 ++ fs/cifs/cifsglob.h | 3 +++ fs/cifs/inode.c | 37 ++++++++++++++++++++++++++ fs/cifs/smb2ops.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 7 ++++- fs/cifs/smb2pdu.h | 5 ++++ fs/cifs/smbfsctl.h | 2 +- 8 files changed, 132 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +1 -0
@@ -992,6 +992,7 @@ const struct inode_operations cifs_file_inode_ops = { .getattr = cifs_getattr, .permission = cifs_permission, .listxattr = cifs_listxattr, + .fiemap = cifs_fiemap, };const struct inode_operations cifs_symlink_inode_ops = {
fs/cifs/cifsfs.h +2 -0
@@ -84,6 +84,8 @@ extern int cifs_revalidate_mapping(struct inode *inode);extern int cifs_zap_mapping (struct inode *inode);extern int cifs_getattr (const struct path *,struct kstat *,u32 ,unsigned int );extern int cifs_setattr (struct dentry *,struct iattr *); +extern int cifs_fiemap (struct inode *,struct fiemap_extent_info *,u64 start, +u64 len);extern const struct inode_operations cifs_file_inode_ops;extern const struct inode_operations cifs_symlink_inode_ops;
fs/cifs/cifsglob.h +3 -0
@@ -494,6 +494,9 @@ struct smb_version_operations {char *full_path, umode_t mode, dev_t device_number); +/* version specific fiemap implementation */ +int (*fiemap)(struct cifs_tcon *tcon,struct cifsFileInfo *, +struct fiemap_extent_info *,u64 ,u64 ); };struct smb_version_values {
fs/cifs/inode.c +37 -0
@@ -2116,6 +2116,43 @@ int cifs_getattr(const struct path *path, struct kstat *stat,return rc; } +int cifs_fiemap (struct inode *inode,struct fiemap_extent_info *fei,u64 start, +u64 len) +{ +struct cifsInodeInfo *cifs_i =CIFS_I (inode); +struct cifs_sb_info *cifs_sb =CIFS_SB (cifs_i->vfs_inode.i_sb); +struct cifs_tcon *tcon =cifs_sb_master_tcon (cifs_sb); +struct TCP_Server_Info *server = tcon->ses->server; +struct cifsFileInfo *cfile; +int rc; + +/* +* We need to be sure that all dirty pages are written as they +* might fill holes on the server. +*/ +if (!CIFS_CACHE_READ (CIFS_I (inode)) && inode->i_mapping && + inode->i_mapping->nrpages !=0 ) { + rc =filemap_fdatawait (inode->i_mapping); +if (rc) { +mapping_set_error (inode->i_mapping, rc); +return rc; + } + } + + cfile =find_readable_file (cifs_i, false); +if (cfile ==NULL ) +return -EINVAL ; + +if (server->ops->fiemap) { + rc = server->ops->fiemap (tcon, cfile, fei, start, len); +cifsFileInfo_put (cfile); +return rc; + } + +cifsFileInfo_put (cfile); +return -ENOTSUPP ; +} +static int cifs_truncate_page (struct address_space *mapping,loff_t from) {pgoff_t index = from >>PAGE_SHIFT ;
fs/cifs/smb2ops.c +77 -0
107 lines not on this page · raw message
fs/cifs/smb2pdu.c +6 -1
@@ -2622,7 +2622,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 ) {
@@ -2631,6 +2631,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
@@ -868,6 +868,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