diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2016-04-21 20:51:57 -0400 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-05-09 09:05:40 -0400 |
| commit | 547a637630c61b9e1dae9abce2b44ce7076244af (patch) | |
| tree | 60e3e0652d66d36f042a1643aaa42e23b4e5e734 /fs/nfs | |
| parent | 62dbef2ae41393eba2f6853ca174130f2d09c7d3 (diff) | |
| download | linux-0-day-547a637630c61b9e1dae9abce2b44ce7076244af.tar.gz linux-0-day-547a637630c61b9e1dae9abce2b44ce7076244af.tar.xz | |
nfs: don't call nfs4_ff_layout_prepare_ds from ff_layout_get_ds_cred
All the callers already call that function before calling into here,
so it ends up being a no-op anyway.
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index add0e5a70bd60..a0dbf94d15ae6 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -433,16 +433,12 @@ ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg, u32 ds_idx, struct rpc_cred *mdscred) { struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, ds_idx); - struct rpc_cred *cred = ERR_PTR(-EINVAL); - - if (!nfs4_ff_layout_prepare_ds(lseg, ds_idx, true)) - goto out; + struct rpc_cred *cred; if (mirror && mirror->cred) cred = mirror->cred; else cred = mdscred; -out: return cred; } |