From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 01/12] xfs: move eofblocks conversion function to xfs_ioctl.c
Date: Fri, 22 May 2020 08:03:13 -0400 [thread overview]
Message-ID: <20200522120313.GB50656@bfoster> (raw)
In-Reply-To: <159011601269.77079.3759128420308877436.stgit@magnolia>
On Thu, May 21, 2020 at 07:53:32PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Move xfs_fs_eofblocks_from_user into the only file that actually uses
> it, so that we don't have this function cluttering up the header file.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_icache.h | 35 -----------------------------------
> fs/xfs/xfs_ioctl.c | 35 +++++++++++++++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 35 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
> index 48f1fd2bb6ad..c13bc8a3e02f 100644
> --- a/fs/xfs/xfs_icache.h
> +++ b/fs/xfs/xfs_icache.h
> @@ -81,41 +81,6 @@ int xfs_inode_ag_iterator_tag(struct xfs_mount *mp,
> int (*execute)(struct xfs_inode *ip, int flags, void *args),
> int flags, void *args, int tag);
>
> -static inline int
> -xfs_fs_eofblocks_from_user(
> - struct xfs_fs_eofblocks *src,
> - struct xfs_eofblocks *dst)
> -{
> - if (src->eof_version != XFS_EOFBLOCKS_VERSION)
> - return -EINVAL;
> -
> - if (src->eof_flags & ~XFS_EOF_FLAGS_VALID)
> - return -EINVAL;
> -
> - if (memchr_inv(&src->pad32, 0, sizeof(src->pad32)) ||
> - memchr_inv(src->pad64, 0, sizeof(src->pad64)))
> - return -EINVAL;
> -
> - dst->eof_flags = src->eof_flags;
> - dst->eof_prid = src->eof_prid;
> - dst->eof_min_file_size = src->eof_min_file_size;
> -
> - dst->eof_uid = INVALID_UID;
> - if (src->eof_flags & XFS_EOF_FLAGS_UID) {
> - dst->eof_uid = make_kuid(current_user_ns(), src->eof_uid);
> - if (!uid_valid(dst->eof_uid))
> - return -EINVAL;
> - }
> -
> - dst->eof_gid = INVALID_GID;
> - if (src->eof_flags & XFS_EOF_FLAGS_GID) {
> - dst->eof_gid = make_kgid(current_user_ns(), src->eof_gid);
> - if (!gid_valid(dst->eof_gid))
> - return -EINVAL;
> - }
> - return 0;
> -}
> -
> int xfs_icache_inode_is_allocated(struct xfs_mount *mp, struct xfs_trans *tp,
> xfs_ino_t ino, bool *inuse);
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 309958186d33..6a3c675a8aeb 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -2082,6 +2082,41 @@ xfs_ioc_setlabel(
> return error;
> }
>
> +static inline int
> +xfs_fs_eofblocks_from_user(
> + struct xfs_fs_eofblocks *src,
> + struct xfs_eofblocks *dst)
> +{
> + if (src->eof_version != XFS_EOFBLOCKS_VERSION)
> + return -EINVAL;
> +
> + if (src->eof_flags & ~XFS_EOF_FLAGS_VALID)
> + return -EINVAL;
> +
> + if (memchr_inv(&src->pad32, 0, sizeof(src->pad32)) ||
> + memchr_inv(src->pad64, 0, sizeof(src->pad64)))
> + return -EINVAL;
> +
> + dst->eof_flags = src->eof_flags;
> + dst->eof_prid = src->eof_prid;
> + dst->eof_min_file_size = src->eof_min_file_size;
> +
> + dst->eof_uid = INVALID_UID;
> + if (src->eof_flags & XFS_EOF_FLAGS_UID) {
> + dst->eof_uid = make_kuid(current_user_ns(), src->eof_uid);
> + if (!uid_valid(dst->eof_uid))
> + return -EINVAL;
> + }
> +
> + dst->eof_gid = INVALID_GID;
> + if (src->eof_flags & XFS_EOF_FLAGS_GID) {
> + dst->eof_gid = make_kgid(current_user_ns(), src->eof_gid);
> + if (!gid_valid(dst->eof_gid))
> + return -EINVAL;
> + }
> + return 0;
> +}
> +
> /*
> * Note: some of the ioctl's return positive numbers as a
> * byte count indicating success, such as readlink_by_handle.
>
next prev parent reply other threads:[~2020-05-22 12:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 2:53 [PATCH v4 00/12] xfs: refactor incore inode walking Darrick J. Wong
2020-05-22 2:53 ` [PATCH 01/12] xfs: move eofblocks conversion function to xfs_ioctl.c Darrick J. Wong
2020-05-22 12:03 ` Brian Foster [this message]
2020-05-22 2:53 ` [PATCH 02/12] xfs: replace open-coded XFS_ICI_NO_TAG Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 03/12] xfs: remove unused xfs_inode_ag_iterator function Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 04/12] xfs: remove xfs_inode_ag_iterator_flags Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 05/12] xfs: remove flags argument from xfs_inode_ag_walk Darrick J. Wong
2020-05-22 6:37 ` Christoph Hellwig
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:54 ` [PATCH 06/12] xfs: remove __xfs_icache_free_eofblocks Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:54 ` [PATCH 07/12] xfs: refactor eofb matching into a single helper Darrick J. Wong
2020-05-22 6:38 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 08/12] xfs: fix inode ag walk predicate function return values Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 09/12] xfs: use bool for done in xfs_inode_ag_walk Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 10/12] xfs: move xfs_inode_ag_iterator to be closer to the perag walking code Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 11/12] xfs: straighten out all the naming around incore inode tree walks Darrick J. Wong
2020-05-22 6:38 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 12/12] xfs: rearrange xfs_inode_walk_ag parameters Darrick J. Wong
2020-05-22 6:39 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522120313.GB50656@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).