diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-08 21:49:53 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-08 22:12:42 -0400 |
| commit | 7a8203d8cbab63b7c556ebd00e12685a3ed176b5 (patch) | |
| tree | cb96463948894dff1a1a61f2af19c5124056873f /fs/nfs/file.c | |
| parent | 577b42327d707fbe7166aad6902c2eeee6a65015 (diff) | |
| download | linux-3.10-7a8203d8cbab63b7c556ebd00e12685a3ed176b5.tar.gz linux-3.10-7a8203d8cbab63b7c556ebd00e12685a3ed176b5.tar.bz2 linux-3.10-7a8203d8cbab63b7c556ebd00e12685a3ed176b5.zip | |
NFS: Ensure that NFS file unlock waits for readahead to complete
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 29f4a48a0ee..a87a44f8411 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -744,6 +744,7 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) { struct inode *inode = filp->f_mapping->host; + struct nfs_lock_context *l_ctx; int status; /* @@ -752,6 +753,14 @@ do_unlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) */ nfs_sync_mapping(filp->f_mapping); + l_ctx = nfs_get_lock_context(nfs_file_open_context(filp)); + if (!IS_ERR(l_ctx)) { + status = nfs_iocounter_wait(&l_ctx->io_count); + nfs_put_lock_context(l_ctx); + if (status < 0) + return status; + } + /* NOTE: special case * If we're signalled while cleaning up locks on process exit, we * still need to complete the unlock. |