]> err.no Git - linux-2.6/commitdiff
NFSv4: Ensure we don't corrupt fl->fl_flags in nfs4_proc_unlck
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Apr 2008 19:08:02 +0000 (15:08 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 19 Apr 2008 20:53:33 +0000 (16:53 -0400)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4proc.c

index 9f2759da74ebc928295269546927e0c8dfe8bddf..a1069325b876ad10abc06dfc8c37879f68e9ae41 100644 (file)
@@ -3263,6 +3263,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *
        struct nfs4_lock_state *lsp;
        struct rpc_task *task;
        int status = 0;
+       unsigned char fl_flags = request->fl_flags;
 
        status = nfs4_set_lock_state(state, request);
        /* 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 *
        status = nfs4_wait_for_completion_rpc_task(task);
        rpc_put_task(task);
 out:
+       request->fl_flags = fl_flags;
        return status;
 }