pNFS/flexfiles: Handle expired layout segments in ff_layout_initiate_commit()
authorTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 12 Jul 2017 23:10:58 +0000 (19:10 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 19 Jul 2017 19:28:21 +0000 (15:28 -0400)
If the layout has expired due to a fencing event, then we should not
attempt to commit to the DS.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/flexfilelayout/flexfilelayout.c

index 1f2ac3dd0fe5c2755dec68b79d64c61030e3f3f2..b0fa83a607541a4ed2f8190e46827778d328912f 100644 (file)
@@ -1842,6 +1842,10 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)
        int vers, ret;
        struct nfs_fh *fh;
 
+       if (!lseg || !(pnfs_is_valid_lseg(lseg) ||
+           test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags)))
+               goto out_err;
+
        idx = calc_ds_index_from_commit(lseg, data->ds_commit_index);
        ds = nfs4_ff_layout_prepare_ds(lseg, idx, true);
        if (!ds)