Commit f4cf5042 authored by Chuck Lever's avatar Chuck Lever

NFSD: Add nfsd4_encode_fattr4_mode()

Refactor the encoder for FATTR4_MODE into a helper. In a subsequent
patch, this helper will be called from a bitmask loop.
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 951378dc
...@@ -3183,6 +3183,12 @@ static __be32 nfsd4_encode_fattr4_maxwrite(struct xdr_stream *xdr, ...@@ -3183,6 +3183,12 @@ static __be32 nfsd4_encode_fattr4_maxwrite(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, svc_max_payload(args->rqstp)); return nfsd4_encode_uint64_t(xdr, svc_max_payload(args->rqstp));
} }
static __be32 nfsd4_encode_fattr4_mode(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
return nfsd4_encode_mode4(xdr, args->stat.mode & S_IALLUGO);
}
/* /*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves. * ourselves.
...@@ -3462,10 +3468,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3462,10 +3468,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out; goto out;
} }
if (bmval1 & FATTR4_WORD1_MODE) { if (bmval1 & FATTR4_WORD1_MODE) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4_mode(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(args.stat.mode & S_IALLUGO);
} }
if (bmval1 & FATTR4_WORD1_NO_TRUNC) { if (bmval1 & FATTR4_WORD1_NO_TRUNC) {
status = nfsd4_encode_fattr4__true(xdr, &args); status = nfsd4_encode_fattr4__true(xdr, &args);
......
...@@ -93,6 +93,7 @@ nfsd4_encode_uint32_t(struct xdr_stream *xdr, u32 val) ...@@ -93,6 +93,7 @@ nfsd4_encode_uint32_t(struct xdr_stream *xdr, u32 val)
#define nfsd4_encode_aceflag4(x, v) nfsd4_encode_uint32_t(x, v) #define nfsd4_encode_aceflag4(x, v) nfsd4_encode_uint32_t(x, v)
#define nfsd4_encode_acemask4(x, v) nfsd4_encode_uint32_t(x, v) #define nfsd4_encode_acemask4(x, v) nfsd4_encode_uint32_t(x, v)
#define nfsd4_encode_acetype4(x, v) nfsd4_encode_uint32_t(x, v) #define nfsd4_encode_acetype4(x, v) nfsd4_encode_uint32_t(x, v)
#define nfsd4_encode_mode4(x, v) nfsd4_encode_uint32_t(x, v)
#define nfsd4_encode_nfs_lease4(x, v) nfsd4_encode_uint32_t(x, v) #define nfsd4_encode_nfs_lease4(x, v) nfsd4_encode_uint32_t(x, v)
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment