diff mbox series

[v1,32/52] NFSD: Add nfsd4_encode_fattr4_owner_group()

Message ID	169504561180.133720.5689851436829082956.stgit@manet.1015granger.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-nfs-owner@vger.kernel.org> Subject: [PATCH v1 32/52] NFSD: Add nfsd4_encode_fattr4_owner_group() From: Chuck Lever <cel@kernel.org> To: linux-nfs@vger.kernel.org Cc: Chuck Lever <chuck.lever@oracle.com> Date: Mon, 18 Sep 2023 10:00:11 -0400 Message-ID: <169504561180.133720.5689851436829082956.stgit@manet.1015granger.net> In-Reply-To: <169504501081.133720.4162400017732492854.stgit@manet.1015granger.net> References: <169504501081.133720.4162400017732492854.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	Modernize nfsd4_encode_fattr() \| expand [v1,00/52] Modernize nfsd4_encode_fattr() [v1,01/52] NFSD: Add simple u32, u64, and bool encoders [v1,02/52] NFSD: Rename nfsd4_encode_bitmap() [v1,03/52] NFSD: Clean up nfsd4_encode_setattr() [v1,04/52] NFSD: Add struct nfsd4_fattr_args [v1,05/52] NFSD: Add nfsd4_encode_fattr4__true() [v1,06/52] NFSD: Add nfsd4_encode_fattr4__false() [v1,07/52] NFSD: Add nfsd4_encode_fattr4_supported_attrs() [v1,08/52] NFSD: Add nfsd4_encode_fattr4_type() [v1,09/52] NFSD: Add nfsd4_encode_fattr4_fh_expire_type() [v1,10/52] NFSD: Add nfsd4_encode_fattr4_change() [v1,11/52] NFSD: Add nfsd4_encode_fattr4_size() [v1,12/52] NFSD: Add nfsd4_encode_fattr4_fsid() [v1,13/52] NFSD: Add nfsd4_encode_fattr4_lease_time() [v1,14/52] NFSD: Add nfsd4_encode_fattr4_rdattr_error() [v1,15/52] NFSD: Add nfsd4_encode_fattr4_aclsupport() [v1,16/52] NFSD: Add nfsd4_encode_nfsace4() [v1,17/52] NFSD: Add nfsd4_encode_fattr4_acl() [v1,18/52] NFSD: Add nfsd4_encode_fattr4_filehandle() [v1,19/52] NFSD: Add nfsd4_encode_fattr4_fileid() [v1,20/52] NFSD: Add nfsd4_encode_fattr4_files_avail() [v1,21/52] NFSD: Add nfsd4_encode_fattr4_files_free() [v1,22/52] NFSD: Add nfsd4_encode_fattr4_files_total() [v1,23/52] NFSD: Add nfsd4_encode_fattr4_fs_locations() [v1,24/52] NFSD: Add nfsd4_encode_fattr4_maxfilesize() [v1,25/52] NFSD: Add nfsd4_encode_fattr4_maxlink() [v1,26/52] NFSD: Add nfsd4_encode_fattr4_maxname() [v1,27/52] NFSD: Add nfsd4_encode_fattr4_maxread() [v1,28/52] NFSD: Add nfsd4_encode_fattr4_maxwrite() [v1,29/52] NFSD: Add nfsd4_encode_fattr4_mode() [v1,30/52] NFSD: Add nfsd4_encode_fattr4_numlinks() [v1,31/52] NFSD: Add nfsd4_encode_fattr4_owner() [v1,32/52] NFSD: Add nfsd4_encode_fattr4_owner_group() [v1,33/52] NFSD: Add nfsd4_encode_fattr4_rawdev() [v1,34/52] NFSD: Add nfsd4_encode_fattr4_space_avail() [v1,35/52] NFSD: Add nfsd4_encode_fattr4_space_free() [v1,36/52] NFSD: Add nfsd4_encode_fattr4_space_total() [v1,37/52] NFSD: Add nfsd4_encode_fattr4_space_used() [v1,38/52] NFSD: Add nfsd4_encode_fattr4_time_access() [v1,39/52] NFSD: Add nfsd4_encode_fattr4_time_create() [v1,40/52] NFSD: Add nfsd4_encode_fattr4_time_delta() [v1,41/52] NFSD: Add nfsd4_encode_fattr4_time_metadata() [v1,42/52] NFSD: Add nfsd4_encode_fattr4_time_modify() [v1,43/52] NFSD: Add nfsd4_encode_fattr4_mounted_on_fileid() [v1,44/52] NFSD: Add nfsd4_encode_fattr4_fs_layout_types() [v1,45/52] NFSD: Add nfsd4_encode_fattr4_layout_types() [v1,46/52] NFSD: Add nfsd4_encode_fattr4_layout_blksize() [v1,47/52] NFSD: Add nfsd4_encode_fattr4_suppattr_exclcreat() [v1,48/52] NFSD: Add nfsd4_encode_fattr4_sec_label() [v1,49/52] NFSD: Add nfsd4_encode_fattr4_xattr_support() [v1,50/52] NFSD: Copy FATTR4 bit number definitions from RFCs [v1,51/52] NFSD: Use a bitmask loop to encode FATTR4 results [v1,52/52] NFSD: Rename nfsd4_encode_fattr()

Commit Message

Chuck Lever Sept. 18, 2023, 2 p.m. UTC

From: Chuck Lever <chuck.lever@oracle.com>

Refactor the encoder for FATTR4_OWNER_GROUP into a helper. In a
subsequent patch, this helper will be called from a bitmask loop.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfs4xdr.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 11922b18f357..91ac991dea9d 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3200,6 +3200,12 @@  static __be32 nfsd4_encode_fattr4_owner(struct xdr_stream *xdr,
 	return nfsd4_encode_user(xdr, args->rqstp, args->stat.uid);
 }
 
+static __be32 nfsd4_encode_fattr4_owner_group(struct xdr_stream *xdr,
+					      const struct nfsd4_fattr_args *args)
+{
+	return nfsd4_encode_group(xdr, args->rqstp, args->stat.gid);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3494,8 +3500,8 @@  nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
-		status = nfsd4_encode_group(xdr, rqstp, args.stat.gid);
-		if (status)
+		status = nfsd4_encode_fattr4_owner_group(xdr, &args);
+		if (status != nfs_ok)
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_RAWDEV) {