mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

NFSv4/pnfs: Clean up layout get on open

Browse source 
Cache the layout in the arguments so we don't have to keep looking it up
from the inode.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2021-07-02 17:24:22 -04:00
parent 0b77f97a7e
commit b4e89bcba2
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nfs/nfs4proc.c
View file

@ -9419,7 +9419,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
{ {
struct inode *inode = lgp->args.inode; struct inode *inode = lgp->args.inode;
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct pnfs_layout_hdr *lo; struct pnfs_layout_hdr *lo = lgp->lo;
int nfs4err = task->tk_status; int nfs4err = task->tk_status;
int err, status = 0; int err, status = 0;
LIST_HEAD(head); LIST_HEAD(head);
@ -9471,7 +9471,6 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
case -NFS4ERR_BAD_STATEID: case -NFS4ERR_BAD_STATEID:
exception->timeout = 0; exception->timeout = 0;
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
lo = NFS_I(inode)->layout;
/* If the open stateid was bad, then recover it. */ /* If the open stateid was bad, then recover it. */
if (!lo || test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) || if (!lo || test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) ||
!nfs4_stateid_match_other(&lgp->args.stateid, &lo->plh_stateid)) { !nfs4_stateid_match_other(&lgp->args.stateid, &lo->plh_stateid)) {
@ -9554,9 +9553,6 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout)
dprintk("--> %s\n", __func__); dprintk("--> %s\n", __func__);
/* nfs4_layoutget_release calls pnfs_put_layout_hdr */
pnfs_get_layout_hdr(NFS_I(inode)->layout);
nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0, 0); nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0, 0);
task = rpc_run_task(&task_setup_data); task = rpc_run_task(&task_setup_data);

28
fs/nfs/pnfs.c
View file

@ -1128,8 +1128,7 @@ void pnfs_layoutget_free(struct nfs4_layoutget *lgp)
size_t max_pages = lgp->args.layout.pglen / PAGE_SIZE; size_t max_pages = lgp->args.layout.pglen / PAGE_SIZE;
nfs4_free_pages(lgp->args.layout.pages, max_pages); nfs4_free_pages(lgp->args.layout.pages, max_pages);
if (lgp->args.inode) pnfs_put_layout_hdr(lgp->lo);
pnfs_put_layout_hdr(NFS_I(lgp->args.inode)->layout);
put_nfs_open_context(lgp->args.ctx); put_nfs_open_context(lgp->args.ctx);
kfree(lgp); kfree(lgp);
} }
@ -2124,6 +2123,9 @@ pnfs_update_layout(struct inode *ino,
goto out_put_layout_hdr; goto out_put_layout_hdr;
} }
lgp->lo = lo;
pnfs_get_layout_hdr(lo);
lseg = nfs4_proc_layoutget(lgp, &timeout); lseg = nfs4_proc_layoutget(lgp, &timeout);
trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg, trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET); PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET);
@ -2255,6 +2257,7 @@ static void _lgopen_prepare_attached(struct nfs4_opendata *data,
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);
return; return;
} }
lgp->lo = lo;
data->lgp = lgp; data->lgp = lgp;
data->o_arg.lg_args = &lgp->args; data->o_arg.lg_args = &lgp->args;
data->o_res.lg_res = &lgp->res; data->o_res.lg_res = &lgp->res;
@ -2263,6 +2266,7 @@ static void _lgopen_prepare_attached(struct nfs4_opendata *data,
static void _lgopen_prepare_floating(struct nfs4_opendata *data, static void _lgopen_prepare_floating(struct nfs4_opendata *data,
struct nfs_open_context *ctx) struct nfs_open_context *ctx)
{ {
struct inode *ino = data->dentry->d_inode;
struct pnfs_layout_range rng = { struct pnfs_layout_range rng = {
.iomode = (data->o_arg.fmode & FMODE_WRITE) ? .iomode = (data->o_arg.fmode & FMODE_WRITE) ?
IOMODE_RW: IOMODE_READ, IOMODE_RW: IOMODE_READ,
@ -2271,7 +2275,7 @@ static void _lgopen_prepare_floating(struct nfs4_opendata *data,
}; };
struct nfs4_layoutget *lgp; struct nfs4_layoutget *lgp;
lgp = pnfs_alloc_init_layoutget_args(NULL, ctx, &current_stateid, lgp = pnfs_alloc_init_layoutget_args(ino, ctx, &current_stateid,
&rng, GFP_KERNEL); &rng, GFP_KERNEL);
if (!lgp) if (!lgp)
return; return;
@ -2291,6 +2295,8 @@ void pnfs_lgopen_prepare(struct nfs4_opendata *data,
/* Could check on max_ops, but currently hardcoded high enough */ /* Could check on max_ops, but currently hardcoded high enough */
if (!nfs_server_capable(data->dir->d_inode, NFS_CAP_LGOPEN)) if (!nfs_server_capable(data->dir->d_inode, NFS_CAP_LGOPEN))
return; return;
if (data->lgp)
return;
if (data->state) if (data->state)
_lgopen_prepare_attached(data, ctx); _lgopen_prepare_attached(data, ctx);
else else
@ -2330,13 +2336,13 @@ void pnfs_parse_lgopen(struct inode *ino, struct nfs4_layoutget *lgp,
} }
return; return;
} }
if (!lgp->args.inode) { if (!lgp->lo) {
lo = _pnfs_grab_empty_layout(ino, ctx); lo = _pnfs_grab_empty_layout(ino, ctx);
if (!lo) if (!lo)
return; return;
lgp->args.inode = ino; lgp->lo = lo;
} else } else
lo = NFS_I(lgp->args.inode)->layout; lo = lgp->lo;
lseg = pnfs_layout_process(lgp); lseg = pnfs_layout_process(lgp);
if (!IS_ERR(lseg)) { if (!IS_ERR(lseg)) {
@ -2349,11 +2355,9 @@ void pnfs_parse_lgopen(struct inode *ino, struct nfs4_layoutget *lgp,
void nfs4_lgopen_release(struct nfs4_layoutget *lgp) void nfs4_lgopen_release(struct nfs4_layoutget *lgp)
{ {
if (lgp != NULL) { if (lgp != NULL) {
struct inode *inode = lgp->args.inode; if (lgp->lo) {
if (inode) { pnfs_clear_first_layoutget(lgp->lo);
struct pnfs_layout_hdr *lo = NFS_I(inode)->layout; nfs_layoutget_end(lgp->lo);
pnfs_clear_first_layoutget(lo);
nfs_layoutget_end(lo);
} }
pnfs_layoutget_free(lgp); pnfs_layoutget_free(lgp);
} }
@ -2362,7 +2366,7 @@ void nfs4_lgopen_release(struct nfs4_layoutget *lgp)
struct pnfs_layout_segment * struct pnfs_layout_segment *
pnfs_layout_process(struct nfs4_layoutget *lgp) pnfs_layout_process(struct nfs4_layoutget *lgp)
{ {
struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout; struct pnfs_layout_hdr *lo = lgp->lo;
struct nfs4_layoutget_res *res = &lgp->res; struct nfs4_layoutget_res *res = &lgp->res;
struct pnfs_layout_segment *lseg; struct pnfs_layout_segment *lseg;
struct inode *ino = lo->plh_inode; struct inode *ino = lo->plh_inode;

1
include/linux/nfs_xdr.h
View file

@ -277,6 +277,7 @@ struct nfs4_layoutget {
struct nfs4_layoutget_args args; struct nfs4_layoutget_args args;
struct nfs4_layoutget_res res; struct nfs4_layoutget_res res;
const struct cred *cred; const struct cred *cred;
struct pnfs_layout_hdr *lo;
gfp_t gfp_flags; gfp_t gfp_flags;
}; };