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>,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-api@vger.kernel.org
Subject: [PATCH v8 38/41] nfs: Remove unused xdr page offsets in getacl/setacl arguments
Date: Mon, 28 Sep 2015 00:09:29 +0200 [thread overview]
Message-ID: <1443391772-10171-39-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1443391772-10171-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 f93b9cd..b3a6558 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4519,7 +4519,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;
@@ -4663,7 +4663,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);
@@ -4755,7 +4754,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.4.3
next prev parent reply other threads:[~2015-09-27 22:13 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-27 22:08 [PATCH v8 00/41] Richacls Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 01/41] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 02/41] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 03/41] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 04/41] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 05/41] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 06/41] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 07/41] richacl: Permission mapping functions Andreas Gruenbacher
2015-09-27 22:08 ` [PATCH v8 08/41] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 09/41] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-09-28 15:28 ` J. Bruce Fields
2015-09-28 23:42 ` Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 10/41] richacl: Permission check algorithm Andreas Gruenbacher
2015-09-28 16:08 ` J. Bruce Fields
2015-09-28 16:25 ` Andreas Grünbacher
2015-09-28 16:29 ` J. Bruce Fields
2015-09-28 16:51 ` Andreas Grünbacher
2015-09-27 22:09 ` [PATCH v8 11/41] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 12/41] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 13/41] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 14/41] richacl: Create-time inheritance Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 15/41] richacl: Automatic Inheritance Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 16/41] richacl: xattr mapping functions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 17/41] vfs: Add richacl permission checking Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 18/41] ext4: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 19/41] ext4: Add richacl feature flag Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 20/41] richacl: acl editing helper functions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 21/41] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 22/41] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 23/41] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 24/41] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 25/41] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 26/41] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 27/41] richacl: Create richacl from mode values Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 28/41] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 29/41] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 30/41] nfsd: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 31/41] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 32/41] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 33/41] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 34/41] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 35/41] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 36/41] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 37/41] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-09-27 22:09 ` Andreas Gruenbacher [this message]
2015-09-27 22:09 ` [PATCH v8 39/41] nfs: Add richacl support Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 40/41] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-09-27 22:09 ` [PATCH v8 41/41] richacl: uapi header split Andreas Gruenbacher
2015-09-28 16:35 ` [PATCH v8 00/41] Richacls J. Bruce Fields
2015-09-28 17:10 ` Andreas Grünbacher
2015-09-28 17:46 ` J. Bruce Fields
2015-09-29 14:54 ` Andreas Grünbacher
2015-10-16 18:12 ` Andreas Gruenbacher
2015-10-04 6:23 ` Christoph Hellwig
2015-10-05 18:45 ` Andreas Gruenbacher
2015-10-05 18:58 ` Austin S Hemmelgarn
2015-10-06 9:49 ` Christoph Hellwig
2015-10-06 13:12 ` Andreas Gruenbacher
2015-10-06 20:26 ` Andreas Dilger
2015-10-06 20:55 ` Steve French
2015-10-07 7:50 ` Christoph Hellwig
2015-10-07 13:38 ` Andreas Gruenbacher
2015-10-07 15:15 ` Steve French
2015-10-05 21:17 ` Dave Chinner
2015-10-05 22:01 ` Andreas Gruenbacher
2015-10-06 1:20 ` Dave Chinner
2015-10-06 9:49 ` James Morris
2015-10-06 12:24 ` Andreas Grünbacher
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=1443391772-10171-39-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=jlayton@poochiereds.net \
--cc=linux-api@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 \
/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).