From: rick.macklem@gmail.com
To: linux-nfs@vger.kernel.org
Cc: Rick Macklem <rmacklem@uoguelph.ca>
Subject: [PATCH v1 17/17] Change a bunch of function prefixes to nfsd42_
Date: Tue, 30 Dec 2025 18:21:19 -0800 [thread overview]
Message-ID: <20251231022119.1714-18-rick.macklem@gmail.com> (raw)
In-Reply-To: <20251231022119.1714-1-rick.macklem@gmail.com>
From: Rick Macklem <rmacklem@uoguelph.ca>
No semantics change.
Signed-off-by: Rick Macklem <rmacklem@uoguelph.ca>
---
fs/nfsd/acl.h | 2 +-
fs/nfsd/nfs4acl.c | 2 +-
fs/nfsd/nfs4proc.c | 4 ++--
fs/nfsd/nfs4xdr.c | 36 ++++++++++++++++++------------------
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h
index 7e061fee2eea..85a90ee37405 100644
--- a/fs/nfsd/acl.h
+++ b/fs/nfsd/acl.h
@@ -47,7 +47,7 @@ __be32 nfs4_acl_write_who(struct xdr_stream *xdr, int who);
int nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
struct nfs4_acl **acl);
-int nfsd4_get_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry,
+int nfsd42_get_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry,
struct posix_acl **pacl_ret, struct posix_acl **dpacl_ret);
__be32 nfsd4_acl_to_attr(enum nfs_ftype4 type, struct nfs4_acl *acl,
struct nfsd_attrs *attr);
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 84bef41848ca..e4bcb2874a4d 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -177,7 +177,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
}
int
-nfsd4_get_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry,
+nfsd42_get_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry,
struct posix_acl **pacl_ret, struct posix_acl **dpacl_ret)
{
struct inode *inode = d_inode(dentry);
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index ae5c1f5b714d..073e9707f41d 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1205,7 +1205,7 @@ vet_deleg_attrs(struct nfsd4_setattr *setattr, struct nfs4_delegation *dp)
* Set the Access and/or Default ACL of a file.
*/
static __be32
-nfsd4_proc_setacl(struct svc_rqst *rqstp, svc_fh *fh, struct inode *inode,
+nfsd42_proc_setacl(struct svc_rqst *rqstp, svc_fh *fh, struct inode *inode,
struct posix_acl *dpacl, struct posix_acl *pacl)
{
int error = 0;
@@ -1319,7 +1319,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfsd_setattr(rqstp, &cstate->current_fh, &attrs, NULL);
cstate->current_fh.fh_no_wcc = save_no_wcc;
if (!status && (setattr->sa_dpacl != NULL || setattr->sa_pacl != NULL))
- status = nfsd4_proc_setacl(rqstp, &cstate->current_fh, inode,
+ status = nfsd42_proc_setacl(rqstp, &cstate->current_fh, inode,
setattr->sa_dpacl, setattr->sa_pacl);
if (!status)
status = nfserrno(attrs.na_labelerr);
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 72530203e985..453c0317c171 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -379,7 +379,7 @@ nfsd4_decode_security_label(struct nfsd4_compoundargs *argp,
}
static __be32
-nfsacl4_posix_xdrtotag(struct xdr_stream *xdr, u32 *tag)
+nfsacl42_posix_xdrtotag(struct xdr_stream *xdr, u32 *tag)
{
u32 type;
@@ -411,13 +411,13 @@ nfsacl4_posix_xdrtotag(struct xdr_stream *xdr, u32 *tag)
}
static __be32
-nfsd4_decode_posixace4(struct nfsd4_compoundargs *argp,
+nfsd42_decode_posixace4(struct nfsd4_compoundargs *argp,
struct posix_acl_entry *ace)
{
u32 val;
__be32 *p, status;
- status = nfsacl4_posix_xdrtotag(argp->xdr, &val);
+ status = nfsacl42_posix_xdrtotag(argp->xdr, &val);
if (status != nfs_ok)
return status;
ace->e_tag = val;
@@ -452,7 +452,7 @@ nfsd4_decode_posixace4(struct nfsd4_compoundargs *argp,
}
static noinline __be32
-nfsd4_decode_posix_acl(struct nfsd4_compoundargs *argp, struct posix_acl **acl)
+nfsd42_decode_posix_acl(struct nfsd4_compoundargs *argp, struct posix_acl **acl)
{
struct posix_acl_entry *ace;
__be32 status;
@@ -475,7 +475,7 @@ nfsd4_decode_posix_acl(struct nfsd4_compoundargs *argp, struct posix_acl **acl)
(*acl)->a_count = count;
for (ace = (*acl)->a_entries; ace < (*acl)->a_entries + count; ace++) {
- status = nfsd4_decode_posixace4(argp, ace);
+ status = nfsd42_decode_posixace4(argp, ace);
if (status) {
posix_acl_release(*acl);
*acl = NULL;
@@ -669,7 +669,7 @@ nfsd4_decode_fattr4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen,
if (bmval[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL) {
struct posix_acl *dpacl;
- status = nfsd4_decode_posix_acl(argp, &dpacl);
+ status = nfsd42_decode_posix_acl(argp, &dpacl);
if (status)
return status;
if (dpaclp)
@@ -680,7 +680,7 @@ nfsd4_decode_fattr4(struct nfsd4_compoundargs *argp, u32 *bmval, u32 bmlen,
if (bmval[2] & FATTR4_WORD2_POSIX_ACCESS_ACL) {
struct posix_acl *pacl;
- status = nfsd4_decode_posix_acl(argp, &pacl);
+ status = nfsd42_decode_posix_acl(argp, &pacl);
if (status)
return status;
if (paclp)
@@ -3622,7 +3622,7 @@ static __be32 nfsd4_encode_fattr4_open_arguments(struct xdr_stream *xdr,
return nfs_ok;
}
-static __be32 nfsd4_encode_fattr4_acl_trueform(struct xdr_stream *xdr,
+static __be32 nfsd42_encode_fattr4_acl_trueform(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
u32 trueform;
@@ -3633,14 +3633,14 @@ static __be32 nfsd4_encode_fattr4_acl_trueform(struct xdr_stream *xdr,
return nfsd4_encode_uint32_t(xdr, trueform);
}
-static __be32 nfsd4_encode_fattr4_acl_trueform_scope(struct xdr_stream *xdr,
+static __be32 nfsd42_encode_fattr4_acl_trueform_scope(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
return nfsd4_encode_uint32_t(xdr, ACL_SCOPE_FILE_SYSTEM);
}
-static int nfsacl4_posix_tagtotype(u32 tag)
+static int nfsacl42_posix_tagtotype(u32 tag)
{
int type;
@@ -3676,7 +3676,7 @@ static __be32 xdr_nfs4ace_stream_encode(struct xdr_stream *xdr,
__be32 status;
int type;
- type = nfsacl4_posix_tagtotype(acep->e_tag);
+ type = nfsacl42_posix_tagtotype(acep->e_tag);
if (type < 0)
return nfserr_resource;
if (xdr_stream_encode_u32(xdr, type) != XDR_UNIT)
@@ -3734,14 +3734,14 @@ static __be32 encode_stream_posixacl(struct xdr_stream *xdr,
return nfs_ok;
}
-static __be32 nfsd4_encode_fattr4_posix_default_acl(struct xdr_stream *xdr,
+static __be32 nfsd42_encode_fattr4_posix_default_acl(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
return encode_stream_posixacl(xdr, args->dpacl, args->rqstp);
}
-static __be32 nfsd4_encode_fattr4_posix_access_acl(struct xdr_stream *xdr,
+static __be32 nfsd42_encode_fattr4_posix_access_acl(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
@@ -3851,10 +3851,10 @@ static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_ops[] = {
[FATTR4_TIME_DELEG_ACCESS] = nfsd4_encode_fattr4__inval,
[FATTR4_TIME_DELEG_MODIFY] = nfsd4_encode_fattr4__inval,
[FATTR4_OPEN_ARGUMENTS] = nfsd4_encode_fattr4_open_arguments,
- [FATTR4_ACL_TRUEFORM] = nfsd4_encode_fattr4_acl_trueform,
- [FATTR4_ACL_TRUEFORM_SCOPE] = nfsd4_encode_fattr4_acl_trueform_scope,
- [FATTR4_POSIX_DEFAULT_ACL] = nfsd4_encode_fattr4_posix_default_acl,
- [FATTR4_POSIX_ACCESS_ACL] = nfsd4_encode_fattr4_posix_access_acl,
+ [FATTR4_ACL_TRUEFORM] = nfsd42_encode_fattr4_acl_trueform,
+ [FATTR4_ACL_TRUEFORM_SCOPE] = nfsd42_encode_fattr4_acl_trueform_scope,
+ [FATTR4_POSIX_DEFAULT_ACL] = nfsd42_encode_fattr4_posix_default_acl,
+ [FATTR4_POSIX_ACCESS_ACL] = nfsd42_encode_fattr4_posix_access_acl,
};
/*
@@ -3985,7 +3985,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
if (attrmask[2] & (FATTR4_WORD2_POSIX_DEFAULT_ACL |
FATTR4_WORD2_POSIX_ACCESS_ACL)) {
- err = nfsd4_get_posix_acl(rqstp, dentry, &args.pacl,
+ err = nfsd42_get_posix_acl(rqstp, dentry, &args.pacl,
&args.dpacl);
if (err == -EOPNOTSUPP)
attrmask[2] &= ~(FATTR4_WORD2_POSIX_DEFAULT_ACL |
--
2.49.0
next prev parent reply other threads:[~2025-12-31 2:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-31 2:21 [PATCH v1 00/17] Add NFSv4.2 POSIX ACL support rick.macklem
2025-12-31 2:21 ` [PATCH v1 01/17] Add definitions for the POSIX draft ACL attributes rick.macklem
2025-12-31 2:21 ` [PATCH v1 02/17] Add a new function to acquire the POSIX draft ACLs rick.macklem
2025-12-31 2:21 ` [PATCH v1 03/17] Add a function to set POSIX ACLs rick.macklem
2025-12-31 2:21 ` [PATCH v1 04/17] Add support for encoding/decoding POSIX draft ACLs rick.macklem
2025-12-31 2:21 ` [PATCH v1 05/17] Add a check for both POSIX and NFSv4 ACLs being set rick.macklem
2025-12-31 2:21 ` [PATCH v1 06/17] Add na_dpaclerr and na_paclerr for file creation rick.macklem
2025-12-31 2:21 ` [PATCH v1 07/17] Add support for POSIX draft ACLs " rick.macklem
2025-12-31 2:21 ` [PATCH v1 08/17] Add the arguments for decoding of POSIX ACLs rick.macklem
2025-12-31 2:21 ` [PATCH v1 09/17] Fix a couple of bugs in POSIX ACL decoding rick.macklem
2025-12-31 2:21 ` [PATCH v1 10/17] Improve correctness for the ACL_TRUEFORM attribute rick.macklem
2025-12-31 2:21 ` [PATCH v1 11/17] Make sort_pacl_range() global rick.macklem
2025-12-31 2:21 ` [PATCH v1 12/17] Call sort_pacl_range() for decoded POSIX draft ACLs rick.macklem
2025-12-31 2:21 ` [PATCH v1 13/17] Fix handling of POSIX ACLs with zero ACEs rick.macklem
2025-12-31 2:21 ` [PATCH v1 14/17] Fix handling of zero length ACLs for file creation rick.macklem
2025-12-31 2:21 ` [PATCH v1 15/17] Do not allow (N)VERIFY to check POSIX ACL attributes rick.macklem
2025-12-31 2:21 ` [PATCH v1 16/17] Set the POSIX ACL attributes supported rick.macklem
2025-12-31 2:21 ` rick.macklem [this message]
2025-12-31 2:47 ` [PATCH v1 00/17] Add NFSv4.2 POSIX ACL support Chuck Lever
2025-12-31 2:49 ` Rick Macklem
2025-12-31 2:57 ` Rick Macklem
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=20251231022119.1714-18-rick.macklem@gmail.com \
--to=rick.macklem@gmail.com \
--cc=linux-nfs@vger.kernel.org \
--cc=rmacklem@uoguelph.ca \
/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