NFSv4: Express delegation limit in units of pages
Since we're tracking modifications to the page cache on a per-page basis, it makes sense to express the limit to how much we may cache in units of pages. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
4eae50143b
commit
7d160a6c46
|
@ -175,7 +175,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred,
|
||||||
if (delegation->inode != NULL) {
|
if (delegation->inode != NULL) {
|
||||||
nfs4_stateid_copy(&delegation->stateid, &res->delegation);
|
nfs4_stateid_copy(&delegation->stateid, &res->delegation);
|
||||||
delegation->type = res->delegation_type;
|
delegation->type = res->delegation_type;
|
||||||
delegation->maxsize = res->maxsize;
|
delegation->pagemod_limit = res->pagemod_limit;
|
||||||
oldcred = delegation->cred;
|
oldcred = delegation->cred;
|
||||||
delegation->cred = get_rpccred(cred);
|
delegation->cred = get_rpccred(cred);
|
||||||
clear_bit(NFS_DELEGATION_NEED_RECLAIM,
|
clear_bit(NFS_DELEGATION_NEED_RECLAIM,
|
||||||
|
@ -337,7 +337,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
nfs4_stateid_copy(&delegation->stateid, &res->delegation);
|
nfs4_stateid_copy(&delegation->stateid, &res->delegation);
|
||||||
delegation->type = res->delegation_type;
|
delegation->type = res->delegation_type;
|
||||||
delegation->maxsize = res->maxsize;
|
delegation->pagemod_limit = res->pagemod_limit;
|
||||||
delegation->change_attr = inode->i_version;
|
delegation->change_attr = inode->i_version;
|
||||||
delegation->cred = get_rpccred(cred);
|
delegation->cred = get_rpccred(cred);
|
||||||
delegation->inode = inode;
|
delegation->inode = inode;
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct nfs_delegation {
|
||||||
struct inode *inode;
|
struct inode *inode;
|
||||||
nfs4_stateid stateid;
|
nfs4_stateid stateid;
|
||||||
fmode_t type;
|
fmode_t type;
|
||||||
loff_t maxsize;
|
unsigned long pagemod_limit;
|
||||||
__u64 change_attr;
|
__u64 change_attr;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
|
|
|
@ -4932,24 +4932,28 @@ static int decode_lookup(struct xdr_stream *xdr)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is too sick! */
|
/* This is too sick! */
|
||||||
static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize)
|
static int decode_space_limit(struct xdr_stream *xdr,
|
||||||
|
unsigned long *pagemod_limit)
|
||||||
{
|
{
|
||||||
__be32 *p;
|
__be32 *p;
|
||||||
uint32_t limit_type, nblocks, blocksize;
|
uint32_t limit_type, nblocks, blocksize;
|
||||||
|
u64 maxsize = 0;
|
||||||
|
|
||||||
p = xdr_inline_decode(xdr, 12);
|
p = xdr_inline_decode(xdr, 12);
|
||||||
if (unlikely(!p))
|
if (unlikely(!p))
|
||||||
goto out_overflow;
|
goto out_overflow;
|
||||||
limit_type = be32_to_cpup(p++);
|
limit_type = be32_to_cpup(p++);
|
||||||
switch (limit_type) {
|
switch (limit_type) {
|
||||||
case 1:
|
case NFS4_LIMIT_SIZE:
|
||||||
xdr_decode_hyper(p, maxsize);
|
xdr_decode_hyper(p, &maxsize);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case NFS4_LIMIT_BLOCKS:
|
||||||
nblocks = be32_to_cpup(p++);
|
nblocks = be32_to_cpup(p++);
|
||||||
blocksize = be32_to_cpup(p);
|
blocksize = be32_to_cpup(p);
|
||||||
*maxsize = (uint64_t)nblocks * (uint64_t)blocksize;
|
maxsize = (uint64_t)nblocks * (uint64_t)blocksize;
|
||||||
}
|
}
|
||||||
|
maxsize >>= PAGE_CACHE_SHIFT;
|
||||||
|
*pagemod_limit = min_t(u64, maxsize, ULONG_MAX);
|
||||||
return 0;
|
return 0;
|
||||||
out_overflow:
|
out_overflow:
|
||||||
print_overflow_msg(__func__, xdr);
|
print_overflow_msg(__func__, xdr);
|
||||||
|
@ -4977,7 +4981,7 @@ static int decode_rw_delegation(struct xdr_stream *xdr,
|
||||||
break;
|
break;
|
||||||
case NFS4_OPEN_DELEGATE_WRITE:
|
case NFS4_OPEN_DELEGATE_WRITE:
|
||||||
res->delegation_type = FMODE_WRITE|FMODE_READ;
|
res->delegation_type = FMODE_WRITE|FMODE_READ;
|
||||||
if (decode_space_limit(xdr, &res->maxsize) < 0)
|
if (decode_space_limit(xdr, &res->pagemod_limit) < 0)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
return decode_ace(xdr, NULL, res->server->nfs_client);
|
return decode_ace(xdr, NULL, res->server->nfs_client);
|
||||||
|
|
|
@ -406,8 +406,8 @@ struct nfs_openres {
|
||||||
const struct nfs_server *server;
|
const struct nfs_server *server;
|
||||||
fmode_t delegation_type;
|
fmode_t delegation_type;
|
||||||
nfs4_stateid delegation;
|
nfs4_stateid delegation;
|
||||||
|
unsigned long pagemod_limit;
|
||||||
__u32 do_recall;
|
__u32 do_recall;
|
||||||
__u64 maxsize;
|
|
||||||
__u32 attrset[NFS4_BITMAP_SIZE];
|
__u32 attrset[NFS4_BITMAP_SIZE];
|
||||||
struct nfs4_string *owner;
|
struct nfs4_string *owner;
|
||||||
struct nfs4_string *group_owner;
|
struct nfs4_string *group_owner;
|
||||||
|
|
Loading…
Reference in New Issue