diff options
author | Tom Haynes <loghyr@primarydata.com> | 2014-12-11 23:02:04 +0100 |
---|---|---|
committer | Tom Haynes <loghyr@primarydata.com> | 2015-02-03 20:06:52 +0100 |
commit | d67ae825a59d639e4d8b82413af84d854617a87e (patch) | |
tree | 6b11fc9afb214e02b9cf0b66a14817c57f0f9a05 /fs/nfs/nfs4proc.c | |
parent | nfs: count DIO good bytes correctly with mirroring (diff) | |
download | linux-d67ae825a59d639e4d8b82413af84d854617a87e.tar.xz linux-d67ae825a59d639e4d8b82413af84d854617a87e.zip |
pnfs/flexfiles: Add the FlexFile Layout Driver
The flexfile layout is a new layout that extends the
file layout. It is currently being drafted as a specification at
https://datatracker.ietf.org/doc/draft-ietf-nfsv4-layout-types/
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Signed-off-by: Tao Peng <bergwolf@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 44c600aac907..ca6dda0f68bb 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7796,9 +7796,7 @@ static void nfs4_layoutreturn_release(void *calldata) spin_lock(&lo->plh_inode->i_lock); if (lrp->res.lrs_present) pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); - clear_bit_unlock(NFS_LAYOUT_RETURN, &lo->plh_flags); - smp_mb__after_atomic(); - wake_up_bit(&lo->plh_flags, NFS_LAYOUT_RETURN); + pnfs_clear_layoutreturn_waitbit(lo); clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags); rpc_wake_up(&NFS_SERVER(lo->plh_inode)->roc_rpcwaitq); lo->plh_block_lgets--; |