xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pNFS: Allow layout drivers to manage private data in struct nfs4_layoutreturn

Browse Source 
Cleanup to allow layout drivers to attach private data to layoutreturn,
and manage the data.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust
2016-09-23 11:38:08 -04:00
parent f8c3cf9d7d
commit 4d796d751c
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/nfs4proc.c
View File

@@ -3039,6 +3039,7 @@ struct nfs4_closedata {
struct {
struct nfs4_layoutreturn_args arg;
struct nfs4_layoutreturn_res res;
struct nfs4_xdr_opaque_data ld_private;
u32 roc_barrier;
bool roc;
} lr;
@@ -3267,6 +3268,7 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait)
if (IS_ERR(calldata->arg.seqid))
goto out_free_calldata;
calldata->arg.fmode = 0;
calldata->lr.arg.ld_private = &calldata->lr.ld_private;
calldata->res.fattr = &calldata->fattr;
calldata->res.seqid = calldata->arg.seqid;
calldata->res.server = server;
@@ -5599,6 +5601,7 @@ struct nfs4_delegreturndata {
struct {
struct nfs4_layoutreturn_args arg;
struct nfs4_layoutreturn_res res;
struct nfs4_xdr_opaque_data ld_private;
u32 roc_barrier;
bool roc;
} lr;
@@ -5735,6 +5738,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co
data->res.fattr = &data->fattr;
data->res.server = server;
data->res.lr_ret = -NFS4ERR_NOMATCHING_LAYOUT;
data->lr.arg.ld_private = &data->lr.ld_private;
nfs_fattr_init(data->res.fattr);
data->timestamp = jiffies;
data->rpc_status = 0;
@@ -8633,6 +8637,8 @@ static void nfs4_layoutreturn_release(void *calldata)
nfs4_sequence_free_slot(&lrp->res.seq_res);
pnfs_put_layout_hdr(lrp->args.layout);
nfs_iput_and_deactive(lrp->inode);
if (lrp->ld_private.ops && lrp->ld_private.ops->free)
lrp->ld_private.ops->free(&lrp->ld_private);
kfree(calldata);
dprintk("<-- %s\n", __func__);
}