diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-07-13 08:56:15 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-20 21:12:44 -0400 |
| commit | 2514b961f3db872fd58ddcc327a9f4687666467d (patch) | |
| tree | 260fc84f75150b663798b1661c9f037674c5abda /fs | |
| parent | b3ba162c05c8c7097bd58c468bb6f59ef890226b (diff) | |
Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation"
This reverts commit ed7f7f145ec1445a130513db9ad8f1547f77a578.
Reverting from stable tree as fix was found to be buggy. New fix pending.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b13edc0865f7..c9ff4a176a25 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5356,7 +5356,6 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, atomic_inc(&lsp->ls_count); /* Ensure we don't close file until we're done freeing locks! */ p->ctx = get_nfs_open_context(ctx); - get_file(fl->fl_file); memcpy(&p->fl, fl, sizeof(p->fl)); p->server = NFS_SERVER(inode); return p; @@ -5368,7 +5367,6 @@ static void nfs4_locku_release_calldata(void *data) nfs_free_seqid(calldata->arg.seqid); nfs4_put_lock_state(calldata->lsp); put_nfs_open_context(calldata->ctx); - fput(calldata->fl.fl_file); kfree(calldata); } |