summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-08-14 18:30:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-08-16 16:15:50 -0400
commitb291f1b1c86aa0c7bc3df2994e6a1a4e53f1fde0 (patch)
tree6f1381f4a70174dc719c557751536e8cb8828757
parent519d3959e30a98f8e135e7a16647c10af5ad63d5 (diff)
downloadop-kernel-dev-b291f1b1c86aa0c7bc3df2994e6a1a4e53f1fde0.zip
op-kernel-dev-b291f1b1c86aa0c7bc3df2994e6a1a4e53f1fde0.tar.gz
NFSv4: Fix the acl cache size calculation
Currently, we do not take into account the size of the 16 byte struct nfs4_cached_acl header, when deciding whether or not we should cache the acl data. Consequently, we will end up allocating an 8k buffer in order to fit a maximum size 4k acl. This patch adjusts the calculation so that we limit the cache size to 4k for the acl header+data. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 286ab70..6352741 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3737,9 +3737,10 @@ out:
static void nfs4_write_cached_acl(struct inode *inode, struct page **pages, size_t pgbase, size_t acl_len)
{
struct nfs4_cached_acl *acl;
+ size_t buflen = sizeof(*acl) + acl_len;
- if (pages && acl_len <= PAGE_SIZE) {
- acl = kmalloc(sizeof(*acl) + acl_len, GFP_KERNEL);
+ if (pages && buflen <= PAGE_SIZE) {
+ acl = kmalloc(buflen, GFP_KERNEL);
if (acl == NULL)
goto out;
acl->cached = 1;
OpenPOWER on IntegriCloud