From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f68.google.com ([209.85.128.68]:50996 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391833AbfHBJvU (ORCPT ); Fri, 2 Aug 2019 05:51:20 -0400 Received: by mail-wm1-f68.google.com with SMTP id v15so67335965wml.0 for ; Fri, 02 Aug 2019 02:51:19 -0700 (PDT) Date: Fri, 2 Aug 2019 11:51:16 +0200 From: Carlos Maiolino Subject: Re: [PATCH 5/9] fs: Move start and length fiemap fields into fiemap_extent_info Message-ID: <20190802095115.bjz6ejbouif3wkbt@pegasus.maiolino.io> References: <20190731141245.7230-1-cmaiolino@redhat.com> <20190731141245.7230-6-cmaiolino@redhat.com> <20190731232837.GZ1561054@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190731232837.GZ1561054@magnolia> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-fsdevel@vger.kernel.org, hch@lst.de, adilger@dilger.ca, jaegeuk@kernel.org, miklos@szeredi.hu, rpeterso@redhat.com, linux-xfs@vger.kernel.org > > > > STATIC int > > xfs_vn_fiemap( > > - struct inode *inode, > > - struct fiemap_extent_info *fieinfo, > > - u64 start, > > - u64 length) > > + struct inode *inode, > > + struct fiemap_extent_info *fieinfo) > > { > > - int error; > > + u64 start = fieinfo->fi_start; > > + u64 length = fieinfo->fi_len; > > + int error; > > Would be nice if the variable name indentation was consistent here, but > otherwise the xfs part looks ok. These fields are removed on the next patch, updating it is really required? > > > > > xfs_ilock(XFS_I(inode), XFS_IOLOCK_SHARED); > > if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) { > > diff --git a/include/linux/fs.h b/include/linux/fs.h > > index d5e7c744aea6..7b744b7de24e 100644 > > --- a/include/linux/fs.h > > +++ b/include/linux/fs.h > > @@ -1705,11 +1705,14 @@ extern bool may_open_dev(const struct path *path); > > * VFS FS_IOC_FIEMAP helper definitions. > > */ > > struct fiemap_extent_info { > > - unsigned int fi_flags; /* Flags as passed from user */ > > - unsigned int fi_extents_mapped; /* Number of mapped extents */ > > - unsigned int fi_extents_max; /* Size of fiemap_extent array */ > > - struct fiemap_extent __user *fi_extents_start; /* Start of > > - fiemap_extent array */ > > + unsigned int fi_flags; /* Flags as passed from user */ > > + u64 fi_start; > > + u64 fi_len; > > Comments for these two new fields? Sure, how about this: u64 fi_start; /* Logical offset at which start mapping */ u64 fi_len; /* Logical length of mapping the caller cares about */ btw, Above indentation won't match final result Christoph, may I keep your reviewed tag by updating the comments as above? Otherwise I'll just remove your tag > > --D > > > + unsigned int fi_extents_mapped; /* Number of mapped extents */ > > + unsigned int fi_extents_max; /* Size of fiemap_extent array */ > > + struct fiemap_extent __user *fi_extents_start; /* Start of > > + fiemap_extent > > + array */ > > }; > > int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, > > u64 phys, u64 len, u32 flags); > > @@ -1841,8 +1844,7 @@ struct inode_operations { > > int (*setattr) (struct dentry *, struct iattr *); > > int (*getattr) (const struct path *, struct kstat *, u32, unsigned int); > > ssize_t (*listxattr) (struct dentry *, char *, size_t); > > - int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, > > - u64 len); > > + int (*fiemap)(struct inode *, struct fiemap_extent_info *); > > int (*update_time)(struct inode *, struct timespec64 *, int); > > int (*atomic_open)(struct inode *, struct dentry *, > > struct file *, unsigned open_flag, > > @@ -3199,11 +3201,10 @@ extern int vfs_readlink(struct dentry *, char __user *, int); > > > > extern int __generic_block_fiemap(struct inode *inode, > > struct fiemap_extent_info *fieinfo, > > - loff_t start, loff_t len, > > get_block_t *get_block); > > extern int generic_block_fiemap(struct inode *inode, > > - struct fiemap_extent_info *fieinfo, u64 start, > > - u64 len, get_block_t *get_block); > > + struct fiemap_extent_info *fieinfo, > > + get_block_t *get_block); > > > > extern struct file_system_type *get_filesystem(struct file_system_type *fs); > > extern void put_filesystem(struct file_system_type *fs); > > -- > > 2.20.1 > > -- Carlos