diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
| commit | 8d12ded3dd499e38e8022fe3ec53920d085e57a3 (patch) | |
| tree | 8b73e5a68f24b0bd33430bed8993de979825ffcf /fs/nfs/nfs4proc.c | |
| parent | d499c106843afa0703a68c64662bf42a16421aec (diff) | |
| parent | 68ab747604da98f0a0414f197f346ac22888fcee (diff) | |
| download | talos-op-linux-8d12ded3dd499e38e8022fe3ec53920d085e57a3.tar.gz talos-op-linux-8d12ded3dd499e38e8022fe3ec53920d085e57a3.zip | |
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 45b35b9b1e36..55e1e3af23a3 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -38,6 +38,7 @@ #include <linux/mm.h> #include <linux/delay.h> #include <linux/errno.h> +#include <linux/file.h> #include <linux/string.h> #include <linux/ratelimit.h> #include <linux/printk.h> @@ -5604,6 +5605,7 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, p->server = server; atomic_inc(&lsp->ls_count); p->ctx = get_nfs_open_context(ctx); + get_file(fl->fl_file); memcpy(&p->fl, fl, sizeof(p->fl)); return p; out_free_seqid: @@ -5716,6 +5718,7 @@ static void nfs4_lock_release(void *calldata) nfs_free_seqid(data->arg.lock_seqid); nfs4_put_lock_state(data->lsp); put_nfs_open_context(data->ctx); + fput(data->fl.fl_file); kfree(data); dprintk("%s: done!\n", __func__); } |
