Commit c88cb472 authored by Chuck Lever's avatar Chuck Lever

NFSD: Add nfsd4_encode_fattr4__true()

Add an encoding helper that encodes a single boolean "true" value.
Attributes that always return "true" can use this helper.

In a subsequent patch, this helper will be called from a bitmask
loop, so it is given a standardized synopsis.
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 83ab8678
...@@ -2948,6 +2948,12 @@ struct nfsd4_fattr_args { ...@@ -2948,6 +2948,12 @@ struct nfsd4_fattr_args {
bool contextsupport; bool contextsupport;
}; };
static __be32 nfsd4_encode_fattr4__true(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
return nfsd4_encode_bool(xdr, true);
}
/* /*
* 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.
...@@ -3134,16 +3140,14 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3134,16 +3140,14 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
p = xdr_encode_hyper(p, args.size); p = xdr_encode_hyper(p, args.size);
} }
if (bmval0 & FATTR4_WORD0_LINK_SUPPORT) { if (bmval0 & FATTR4_WORD0_LINK_SUPPORT) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_SYMLINK_SUPPORT) { if (bmval0 & FATTR4_WORD0_SYMLINK_SUPPORT) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_NAMED_ATTR) { if (bmval0 & FATTR4_WORD0_NAMED_ATTR) {
p = xdr_reserve_space(xdr, 4); p = xdr_reserve_space(xdr, 4);
...@@ -3231,10 +3235,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3231,10 +3235,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL : 0); ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL : 0);
} }
if (bmval0 & FATTR4_WORD0_CANSETTIME) { if (bmval0 & FATTR4_WORD0_CANSETTIME) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_CASE_INSENSITIVE) { if (bmval0 & FATTR4_WORD0_CASE_INSENSITIVE) {
p = xdr_reserve_space(xdr, 4); p = xdr_reserve_space(xdr, 4);
...@@ -3243,16 +3246,14 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3243,16 +3246,14 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
*p++ = cpu_to_be32(0); *p++ = cpu_to_be32(0);
} }
if (bmval0 & FATTR4_WORD0_CASE_PRESERVING) { if (bmval0 & FATTR4_WORD0_CASE_PRESERVING) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_CHOWN_RESTRICTED) { if (bmval0 & FATTR4_WORD0_CHOWN_RESTRICTED) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_FILEHANDLE) { if (bmval0 & FATTR4_WORD0_FILEHANDLE) {
p = xdr_reserve_space(xdr, args.fhp->fh_handle.fh_size + 4); p = xdr_reserve_space(xdr, args.fhp->fh_handle.fh_size + 4);
...@@ -3291,10 +3292,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3291,10 +3292,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out; goto out;
} }
if (bmval0 & FATTR4_WORD0_HOMOGENEOUS) { if (bmval0 & FATTR4_WORD0_HOMOGENEOUS) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval0 & FATTR4_WORD0_MAXFILESIZE) { if (bmval0 & FATTR4_WORD0_MAXFILESIZE) {
p = xdr_reserve_space(xdr, 8); p = xdr_reserve_space(xdr, 8);
...@@ -3333,10 +3333,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3333,10 +3333,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
*p++ = cpu_to_be32(args.stat.mode & S_IALLUGO); *p++ = cpu_to_be32(args.stat.mode & S_IALLUGO);
} }
if (bmval1 & FATTR4_WORD1_NO_TRUNC) { if (bmval1 & FATTR4_WORD1_NO_TRUNC) {
p = xdr_reserve_space(xdr, 4); status = nfsd4_encode_fattr4__true(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
*p++ = cpu_to_be32(1);
} }
if (bmval1 & FATTR4_WORD1_NUMLINKS) { if (bmval1 & FATTR4_WORD1_NUMLINKS) {
p = xdr_reserve_space(xdr, 4); p = xdr_reserve_space(xdr, 4);
......
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