From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v13 48/51] nfs: Remove unused xdr page offsets in getacl/setacl arguments
Date: Tue, 3 Nov 2015 16:17:24 +0100 [thread overview]
Message-ID: <1446563847-14005-49-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1446563847-14005-1-git-send-email-agruenba@redhat.com>
The arguments passed around for getacl and setacl xdr encoding, struct
nfs_setaclargs and struct nfs_getaclargs, both contain an array of
pages, an offset into the first page, and the length of the page data.
The offset is unused as it is always zero; remove it.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/nfs/nfs4proc.c | 5 ++---
fs/nfs/nfs4xdr.c | 4 ++--
include/linux/nfs_xdr.h | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 5133bb1..eec5c4c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4530,7 +4530,7 @@ static inline int nfs4_server_supports_acls(struct nfs_server *server)
#define NFS4ACL_MAXPAGES DIV_ROUND_UP(XATTR_SIZE_MAX, PAGE_SIZE)
static int buf_to_pages_noslab(const void *buf, size_t buflen,
- struct page **pages, unsigned int *pgbase)
+ struct page **pages)
{
struct page *newpage, **spages;
int rc = 0;
@@ -4674,7 +4674,6 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu
goto out_free;
args.acl_len = npages * PAGE_SIZE;
- args.acl_pgbase = 0;
dprintk("%s buf %p buflen %zu npages %d args.acl_len %zu\n",
__func__, buf, buflen, npages, args.acl_len);
@@ -4766,7 +4765,7 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
return -EOPNOTSUPP;
if (npages > ARRAY_SIZE(pages))
return -ERANGE;
- i = buf_to_pages_noslab(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
+ i = buf_to_pages_noslab(buf, buflen, arg.acl_pages);
if (i < 0)
return i;
nfs4_inode_return_delegation(inode);
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 6f6d921..eefed15 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1659,7 +1659,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun
*p = cpu_to_be32(FATTR4_WORD0_ACL);
p = reserve_space(xdr, 4);
*p = cpu_to_be32(arg->acl_len);
- xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);
+ xdr_write_pages(xdr, arg->acl_pages, 0, arg->acl_len);
}
static void
@@ -2491,7 +2491,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr,
encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);
xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
- args->acl_pages, args->acl_pgbase, args->acl_len);
+ args->acl_pages, 0, args->acl_len);
encode_nops(&hdr);
}
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 52faf7e..090ade4 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -685,7 +685,6 @@ struct nfs_setaclargs {
struct nfs4_sequence_args seq_args;
struct nfs_fh * fh;
size_t acl_len;
- unsigned int acl_pgbase;
struct page ** acl_pages;
};
@@ -697,7 +696,6 @@ struct nfs_getaclargs {
struct nfs4_sequence_args seq_args;
struct nfs_fh * fh;
size_t acl_len;
- unsigned int acl_pgbase;
struct page ** acl_pages;
};
--
2.5.0
next prev parent reply other threads:[~2015-11-03 15:23 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 15:16 [PATCH v13 00/51] Richacls Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 01/51] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 02/51] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-11-04 2:33 ` Andreas Dilger
2015-11-04 3:02 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 03/51] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 04/51] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 05/51] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 06/51] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 07/51] richacl: Permission mapping functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 08/51] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 09/51] richacl: Permission check algorithm Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 10/51] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-11-03 22:29 ` Andreas Dilger
2015-11-04 21:54 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 11/51] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 12/51] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-11-04 2:03 ` Andreas Dilger
2015-11-04 22:10 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 13/51] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 14/51] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 15/51] richacl: Create-time inheritance Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 16/51] richacl: Automatic Inheritance Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 17/51] richacl: xattr mapping functions Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 18/51] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 19/51] vfs: Add richacl permission checking Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 20/51] ext4: Add richacl support Andreas Gruenbacher
2015-11-04 2:13 ` Andreas Dilger
2015-11-04 2:19 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 21/51] ext4: Add richacl feature flag Andreas Gruenbacher
2015-11-04 2:18 ` Andreas Dilger
2015-11-04 2:28 ` Andreas Gruenbacher
2015-11-04 2:43 ` Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 22/51] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher
2015-11-03 15:16 ` [PATCH v13 23/51] xfs: Make xfs_set_mode non-static Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 24/51] xfs: Change how listxattr generates synthetic attributes Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 25/51] xfs: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 26/51] xfs: Plug memory leak in xfs_attrmulti_attr_set Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 27/51] xfs: Fix richacl access by ioctl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 28/51] richacl: acl editing helper functions Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 29/51] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 30/51] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 31/51] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 32/51] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 33/51] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 34/51] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 35/51] richacl: Create richacl from mode values Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 36/51] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 37/51] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 38/51] nfsd: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 39/51] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 40/51] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 41/51] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 42/51] nfsd: Add support for unmapped richace identifiers Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 43/51] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-11-04 2:20 ` Andreas Dilger
2015-11-03 15:17 ` [PATCH v13 44/51] xfs: " Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 45/51] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-11-03 16:25 ` Trond Myklebust
2015-11-05 11:07 ` Andreas Gruenbacher
2015-11-05 15:57 ` Trond Myklebust
2015-11-08 22:19 ` Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 46/51] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 47/51] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-11-03 16:30 ` Trond Myklebust
2015-11-03 15:17 ` Andreas Gruenbacher [this message]
2015-11-03 15:17 ` [PATCH v13 49/51] nfs: Distinguish missing users and groups from nobody Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 50/51] nfs: Add richacl support Andreas Gruenbacher
2015-11-03 15:17 ` [PATCH v13 51/51] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
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=1446563847-14005-49-git-send-email-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=adilger.kernel@dilger.ca \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/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).