Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c8315dd authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

nfs: always update creds in mirror, even when we have an already connected ds 



A ds can be associated with more than one mirror, but we currently skip
setting a mirror's credentials if we find that it's already set up with
a connected client.

The upshot is that we can end up sending DS writes with MDS credentials
instead of properly setting them up. Fix nfs4_ff_layout_prepare_ds to
always verify that the mirror's credentials are set up, even when we
have a DS that's already connected.

Reported-by: default avatarTom Haynes <thomas.haynes@primarydata.com>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Cc: stable@vger.kernel.org # 4.0+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent a24221dc

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
	/* matching smp_wmb() in _nfs4_pnfs_v3/4_ds_connect */

	smp_rmb();

	if (ds->ds_clp)

		goto out;

		goto out_update_creds;



	flavor = nfs4_ff_layout_choose_authflavor(mirror);
@@ -431,7 +431,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, 
			}

		}

	}



out_update_creds:

	if (ff_layout_update_mirror_cred(mirror, ds))

		ds = NULL;

out: