From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f194.google.com ([209.85.215.194]:32924 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387441AbeKFHka (ORCPT ); Tue, 6 Nov 2018 02:40:30 -0500 Received: by mail-pg1-f194.google.com with SMTP id q5-v6so4865779pgv.0 for ; Mon, 05 Nov 2018 14:18:37 -0800 (PST) From: Andreas Dilger Message-Id: <39BFCB99-F6C2-466F-855A-0AE844D5ECD6@dilger.ca> Content-Type: multipart/signed; boundary="Apple-Mail=_ADAAF8AF-B824-4E4C-9308-05AF232DD36A"; protocol="application/pgp-signature"; micalg=pgp-sha256 Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: [PATCH 07/20] fiemap: Move fiemap flags to fiemap_ctx Date: Mon, 5 Nov 2018 15:12:07 -0700 In-Reply-To: <20181030131823.29040-8-cmaiolino@redhat.com> Cc: Linux FS-devel Mailing List , Eric Sandeen , Christoph Hellwig , Dave Chinner , darrick.wong@oracle.com To: Carlos Maiolino References: <20181030131823.29040-1-cmaiolino@redhat.com> <20181030131823.29040-8-cmaiolino@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: --Apple-Mail=_ADAAF8AF-B824-4E4C-9308-05AF232DD36A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Oct 30, 2018, at 7:18 AM, Carlos Maiolino = wrote: >=20 > struct fiemap_extent_info, will be gone in a later patch, but we still = need the flags. > So, move the fiemap flags up to the new context structure fiemap_ctx. Doesn't this mostly boil down to renaming fiemap_extent_info to = fiemap_ctx, if you are moving all of the fields from one to the other? > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index ebe5aae69c44..77fd8587b8e7 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -8619,7 +8619,7 @@ static int btrfs_fiemap(struct inode *inode, = struct fiemap_ctx *f_ctx) > u64 len =3D f_ctx->fc_len; > int ret; >=20 > - ret =3D fiemap_check_flags(fieinfo, BTRFS_FIEMAP_FLAGS); > + ret =3D fiemap_check_flags(f_ctx, BTRFS_FIEMAP_FLAGS); The other minor nit about this patch series is that "f_ctx" is not a = very descriptive variable name. How about "fiemap_ctx"? A bit longer, but = it is immediately clear to the reader what it is. Cheers, Andreas > diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c > index beccae768dac..d52aafc34e25 100644 > --- a/fs/ext4/extents.c > +++ b/fs/ext4/extents.c > @@ -5063,7 +5063,7 @@ int ext4_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) > return error; > } >=20 > - if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) { > + if (f_ctx->fc_flags & FIEMAP_FLAG_CACHE) { > error =3D ext4_ext_precache(inode); > if (error) > return error; > @@ -5073,10 +5073,10 @@ int ext4_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) > if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) > return generic_block_fiemap(inode, f_ctx, = ext4_get_block); >=20 > - if (fiemap_check_flags(fieinfo, EXT4_FIEMAP_FLAGS)) > + if (fiemap_check_flags(f_ctx, EXT4_FIEMAP_FLAGS)) > return -EBADR; >=20 > - if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) { > + if (f_ctx->fc_flags & FIEMAP_FLAG_XATTR) { > error =3D ext4_xattr_fiemap(inode, fieinfo); > } else { > ext4_lblk_t len_blks; > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 0f57403feb92..c552e2d1dfbb 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -1409,19 +1409,19 @@ int f2fs_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) > u32 flags =3D 0; > int ret =3D 0; >=20 > - if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) { > + if (f_ctx->fc_flags & FIEMAP_FLAG_CACHE) { > ret =3D f2fs_precache_extents(inode); > if (ret) > return ret; > } >=20 > - ret =3D fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC | = FIEMAP_FLAG_XATTR); > + ret =3D fiemap_check_flags(f_ctx, FIEMAP_FLAG_SYNC | = FIEMAP_FLAG_XATTR); > if (ret) > return ret; >=20 > inode_lock(inode); >=20 > - if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) { > + if (f_ctx->fc_flags & FIEMAP_FLAG_XATTR) { > ret =3D f2fs_xattr_fiemap(inode, fieinfo); > goto out; > } > diff --git a/fs/ioctl.c b/fs/ioctl.c > index ddcc4f9a9cf1..77af3b116972 100644 > --- a/fs/ioctl.c > +++ b/fs/ioctl.c > @@ -139,13 +139,13 @@ EXPORT_SYMBOL(fiemap_fill_next_extent); > * > * Returns 0 on success, -EBADR on bad flags. > */ > -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 = fs_flags) > +int fiemap_check_flags(struct fiemap_ctx *f_ctx, u32 fs_flags) > { > u32 incompat_flags; >=20 > - incompat_flags =3D fieinfo->fi_flags & ~(FIEMAP_FLAGS_COMPAT & = fs_flags); > + incompat_flags =3D f_ctx->fc_flags & ~(FIEMAP_FLAGS_COMPAT & = fs_flags); > if (incompat_flags) { > - fieinfo->fi_flags =3D incompat_flags; > + f_ctx->fc_flags =3D incompat_flags; > return -EBADR; > } > return 0; > @@ -199,25 +199,24 @@ static int ioctl_fiemap(struct file *filp, = unsigned long arg) > if (error) > return error; >=20 > - fieinfo.fi_flags =3D fiemap.fm_flags; > fieinfo.fi_extents_max =3D fiemap.fm_extent_count; > fieinfo.fi_extents_start =3D ufiemap->fm_extents; >=20 > + f_ctx.fc_flags =3D fiemap.fm_flags; > + f_ctx.fc_data =3D &fieinfo; > + f_ctx.fc_start =3D fiemap.fm_start; > + f_ctx.fc_len =3D len; > + > if (fiemap.fm_extent_count !=3D 0 && > !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start, > fieinfo.fi_extents_max * sizeof(struct = fiemap_extent))) > return -EFAULT; >=20 > - if (fieinfo.fi_flags & FIEMAP_FLAG_SYNC) > + if (f_ctx.fc_flags & FIEMAP_FLAG_SYNC) > filemap_write_and_wait(inode->i_mapping); >=20 > - f_ctx.fc_flags =3D fieinfo.fi_flags; > - f_ctx.fc_data =3D &fieinfo; > - f_ctx.fc_start =3D fiemap.fm_start; > - f_ctx.fc_len =3D len; > - > error =3D inode->i_op->fiemap(inode, &f_ctx); > - fiemap.fm_flags =3D fieinfo.fi_flags; > + fiemap.fm_flags =3D f_ctx.fc_flags; > fiemap.fm_mapped_extents =3D fieinfo.fi_extents_mapped; > if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap))) > error =3D -EFAULT; > @@ -298,7 +297,7 @@ int __generic_block_fiemap(struct inode *inode, = struct fiemap_ctx *f_ctx, > bool past_eof =3D false, whole_file =3D false; > int ret =3D 0; >=20 > - ret =3D fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC); > + ret =3D fiemap_check_flags(f_ctx, FIEMAP_FLAG_SYNC); > if (ret) > return ret; >=20 > diff --git a/fs/iomap.c b/fs/iomap.c > index 42b131e1c955..5afca566c2a9 100644 > --- a/fs/iomap.c > +++ b/fs/iomap.c > @@ -1166,11 +1166,11 @@ int iomap_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx, > ctx.fi =3D fi; > ctx.prev.type =3D IOMAP_HOLE; >=20 > - ret =3D fiemap_check_flags(fi, FIEMAP_FLAG_SYNC); > + ret =3D fiemap_check_flags(f_ctx, FIEMAP_FLAG_SYNC); > if (ret) > return ret; >=20 > - if (fi->fi_flags & FIEMAP_FLAG_SYNC) { > + if (f_ctx->fc_flags & FIEMAP_FLAG_SYNC) { > ret =3D filemap_write_and_wait(inode->i_mapping); > if (ret) > return ret; > diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c > index 529262f0ab7d..a8040ed52bd5 100644 > --- a/fs/nilfs2/inode.c > +++ b/fs/nilfs2/inode.c > @@ -1007,7 +1007,7 @@ int nilfs_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) > unsigned int blkbits =3D inode->i_blkbits; > int ret, n; >=20 > - ret =3D fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC); > + ret =3D fiemap_check_flags(f_ctx, FIEMAP_FLAG_SYNC); > if (ret) > return ret; >=20 > diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c > index 1944f5659267..5ba98d7a7a42 100644 > --- a/fs/ocfs2/extent_map.c > +++ b/fs/ocfs2/extent_map.c > @@ -762,7 +762,7 @@ int ocfs2_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) > struct buffer_head *di_bh =3D NULL; > struct ocfs2_extent_rec rec; >=20 > - ret =3D fiemap_check_flags(fieinfo, OCFS2_FIEMAP_FLAGS); > + ret =3D fiemap_check_flags(f_ctx, OCFS2_FIEMAP_FLAGS); > if (ret) > return ret; >=20 > diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c > index e56606c1ba92..3cef3b9b1854 100644 > --- a/fs/overlayfs/inode.c > +++ b/fs/overlayfs/inode.c > @@ -458,7 +458,6 @@ int ovl_update_time(struct inode *inode, struct = timespec64 *ts, int flags) >=20 > static int ovl_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx) > { > - struct fiemap_extent_info *fieinfo =3D f_ctx->fc_data; > int err; > struct inode *realinode =3D ovl_inode_real(inode); > const struct cred *old_cred; > @@ -468,7 +467,7 @@ static int ovl_fiemap(struct inode *inode, struct = fiemap_ctx *f_ctx) >=20 > old_cred =3D ovl_override_creds(inode->i_sb); >=20 > - if (fieinfo->fi_flags & FIEMAP_FLAG_SYNC) > + if (f_ctx->fc_flags & FIEMAP_FLAG_SYNC) > filemap_write_and_wait(realinode->i_mapping); >=20 > err =3D realinode->i_op->fiemap(realinode, f_ctx); > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index 22c479862ba6..d859558de2fe 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -1095,14 +1095,13 @@ xfs_vn_fiemap( > struct inode *inode, > struct fiemap_ctx *f_ctx) > { > - struct fiemap_extent_info *fieinfo =3D f_ctx->fc_data; > u64 start =3D f_ctx->fc_start; > u64 length =3D f_ctx->fc_len; > int error; >=20 > xfs_ilock(XFS_I(inode), XFS_IOLOCK_SHARED); > - if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) { > - fieinfo->fi_flags &=3D ~FIEMAP_FLAG_XATTR; > + if (f_ctx->fc_flags & FIEMAP_FLAG_XATTR) { > + f_ctx->fc_flags &=3D ~FIEMAP_FLAG_XATTR; > error =3D iomap_fiemap(inode, f_ctx, start, length, > &xfs_xattr_iomap_ops); > } else { > diff --git a/include/linux/fs.h b/include/linux/fs.h > index bd8e8a7dfd59..fb060123acff 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1692,7 +1692,6 @@ extern bool may_open_dev(const struct path = *path); > struct fiemap_ctx; >=20 > 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 > @@ -1703,7 +1702,7 @@ typedef int (*fiemap_fill_cb)(struct fiemap_ctx = *f_ctx, u64 logical, > u64 phys, u64 len, u32 flags); >=20 > struct fiemap_ctx { > - unsigned int fc_flags; > + unsigned int fc_flags; /* Flags as passed from user */ > void *fc_data; > fiemap_fill_cb fc_cb; /* Unused by now */ > u64 fc_start; > @@ -1712,7 +1711,7 @@ struct fiemap_ctx { >=20 > int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 = logical, > u64 phys, u64 len, u32 flags); > -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 = fs_flags); > +int fiemap_check_flags(struct fiemap_ctx *f_ctx, u32 fs_flags); >=20 > /* > * File types > -- > 2.17.1 >=20 Cheers, Andreas --Apple-Mail=_ADAAF8AF-B824-4E4C-9308-05AF232DD36A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAlvgwDcACgkQcqXauRfM H+A8bw//ZBOBztw3r4mtT6QrW7pKqA/tfPdAY6w7eSHuv9M7ak9XheQgrCXXZiJ4 EyT7Xa4Df2HEtZgCPW4B92NQB3uf41DINkTggutyntZRdyuDEjndz5v2mJjQbBdz y1zdNjb7w+wrVmuMqN5+VbNTOS0fW6tpbyAyrXqlnDIQcybDFEwK9QcVEvIfqz0d EhhTtQItGjoibvCJTi6RVrtLZC+M1l2MbQN9+8gmNzB+KfwaG391382crdnHwZ7C gsW494t9CoZ1QKZlxWT40ychBiTZwkcCw6f19vaogzkdlEHnk0Lbia4jSwcLWw+K H8+cHmEIeOe0eAoxuopWQVjifWXqPdZcorOXD14mwC1ssKbcBnZEJy4iefgC04eS a6VI2+zddzYwShimnTtEQjH++aHSs0JDNzm/K4DnR1YEtiRy/hvcLjhhEGMuKjsh iFFrDBT+qg1Pej2XlyAOKAs/KK0VdFuJJMp66pTxUpp2EdKHYXspTvgjMtTNfd7v E91elbKnSSG7PaggMB66o1HHmRSyaC19py9dKP5Ug4YpWUO23FmDOXbf0onPI2RT hI4p2C2szDgTspAzGA2VBuQg1dm73Y6FoGEUIaYzCeaMk08cmIJWeyPJMXGH7KFN Xz/BtzVa1Swe+KjVtlDebHMygC9k6m6X5rs8IviHd0P+aWeUNKU= =2pOK -----END PGP SIGNATURE----- --Apple-Mail=_ADAAF8AF-B824-4E4C-9308-05AF232DD36A--