diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2016-01-06 10:40:18 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-01-07 18:42:51 -0500 |
| commit | 210c7c1750fdf769647d1d526c9ea34c412c9eee (patch) | |
| tree | d3e6e91f525fad7ab5fb23f38075af32184cc87c /fs/nfs/write.c | |
| parent | 942e3d72a62dcfe5bf1569b179174718bbbcfbc3 (diff) | |
| download | linux-stable-210c7c1750fdf769647d1d526c9ea34c412c9eee.tar.gz linux-stable-210c7c1750fdf769647d1d526c9ea34c412c9eee.tar.bz2 linux-stable-210c7c1750fdf769647d1d526c9ea34c412c9eee.zip | |
NFS: Use wait_on_atomic_t() for unlock after readahead
The use of wait_on_atomic_t() for waiting on I/O to complete before
unlocking allows us to git rid of the NFS_IO_INPROGRESS flag, and thus the
nfs_iocounter's flags member, and finally the nfs_iocounter altogether.
The count of I/O is moved to the lock context, and the counter
increment/decrement functions become simple enough to open-code.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
[Trond: Fix up conflict with existing function nfs_wait_atomic_killable()]
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 94828b3f8c95..8ba4f717b413 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1565,14 +1565,6 @@ static void nfs_writeback_result(struct rpc_task *task, } } -static int nfs_wait_atomic_killable(atomic_t *key) -{ - if (fatal_signal_pending(current)) - return -ERESTARTSYS; - freezable_schedule_unsafe(); - return 0; -} - static int wait_on_commit(struct nfs_mds_commit_info *cinfo) { return wait_on_atomic_t(&cinfo->rpcs_out, |