aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs42proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-07-24 17:08:59 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-07-24 17:08:59 -0400
commit668f455dac57050e33a43ff5fe006f6cd947fc65 (patch)
tree46198f7e5f200bac7be319f9a5f003aebb18e600 /fs/nfs/nfs42proc.c
parentMerge branch 'writeback' (diff)
parentpNFS: Remove redundant smp_mb() from pnfs_init_lseg() (diff)
downloadlinux-dev-668f455dac57050e33a43ff5fe006f6cd947fc65.tar.xz
linux-dev-668f455dac57050e33a43ff5fe006f6cd947fc65.zip
Merge branch 'pnfs'
Diffstat (limited to 'fs/nfs/nfs42proc.c')
-rw-r--r--fs/nfs/nfs42proc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 616dc254b38b..33da841a21bb 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -351,8 +351,7 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata)
* Mark the bad layout state as invalid, then retry
* with the current stateid.
*/
- set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);
- pnfs_mark_matching_lsegs_invalid(lo, &head, NULL, 0);
+ pnfs_mark_layout_stateid_invalid(lo, &head);
spin_unlock(&inode->i_lock);
pnfs_free_lseg_list(&head);
} else