Browse Source

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>
Jeff Layton 9 years ago
parent
commit
547a637630
1 changed files with 1 additions and 5 deletions
  1. 1 5
      fs/nfs/flexfilelayout/flexfilelayoutdev.c

+ 1 - 5
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 rpc_cred *mdscred)
 {
 {
 	struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, ds_idx);
 	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)
 	if (mirror && mirror->cred)
 		cred = mirror->cred;
 		cred = mirror->cred;
 	else
 	else
 		cred = mdscred;
 		cred = mdscred;
-out:
 	return cred;
 	return cred;
 }
 }