On Thu, 26 Sep 2013 15:39:27 -0400 Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> wrote: > We need to ensure that the initialisation of the data server nfs_client > structure in nfs4_ds_connect is correctly ordered w.r.t. the read of > ds->ds_clp in nfs4_fl_prepare_ds. > > Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> > --- > fs/nfs/nfs4filelayoutdev.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c > index ea2b2bf..6456fc4 100644 > --- a/fs/nfs/nfs4filelayoutdev.c > +++ b/fs/nfs/nfs4filelayoutdev.c > @@ -185,6 +185,7 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds) > if (status) > goto out_put; > > + smp_wmb(); > ds->ds_clp = clp; > dprintk("%s [new] addr: %s\n", __func__, ds->ds_remotestr); > out: > @@ -812,6 +813,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) > filelayout_mark_devid_invalid(devid); > goto out; > } > + smp_rmb(); > if (ds->ds_clp) > goto out; > I noticed that you had patch #2 in this series marked for stable in your for-next branch, but this one wasn't. Should this one also go to stable? -- Jeff Layton <jlayton@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html