Skip to content

L
linux-davinci
Commit 536ff0f8 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Ensure we don't corrupt fl->fl_flags in nfs4_proc_unlck 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4a9af59f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
fs/nfs/nfs4proc.c
View file @ 536ff0f8
...@@ -3263,6 +3263,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock * ...@@ -3263,6 +3263,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *
struct nfs4_lock_state *lsp; struct nfs4_lock_state *lsp;
struct rpc_task *task; struct rpc_task *task;
int status = 0; int status = 0;
unsigned char fl_flags = request->fl_flags;
status = nfs4_set_lock_state(state, request); status = nfs4_set_lock_state(state, request);
/* Unlock _before_ we do the RPC call */ /* Unlock _before_ we do the RPC call */
...@@ -3286,6 +3287,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock * ...@@ -3286,6 +3287,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *
status = nfs4_wait_for_completion_rpc_task(task); status = nfs4_wait_for_completion_rpc_task(task);
rpc_put_task(task); rpc_put_task(task);
out: out:
request->fl_flags = fl_flags;
return status; return status;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment