[07/21] NFSv4: Fix open recovery
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-10 22:50:29
Also in:
lkml
2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust <redacted> commit b0ed9dbc24f1fd912b2dd08b995153cafc1d5b1c upstream. NFSv4 open recovery is currently broken: since we do not clear the state->flags states before attempting recovery, we end up with the 'can_open_cached()' function triggering. This again leads to no OPEN call being put on the wire. Reported-by: Sachin Prabhu <redacted> Signed-off-by: Trond Myklebust <redacted> Cc: Chuck Lever <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- fs/nfs/nfs4proc.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c@@ -1067,6 +1067,7 @@ static int nfs4_open_recover(struct nfs4 clear_bit(NFS_DELEGATED_STATE, &state->flags); smp_rmb(); if (state->n_rdwr != 0) { + clear_bit(NFS_O_RDWR_STATE, &state->flags); ret = nfs4_open_recover_helper(opendata, FMODE_READ|FMODE_WRITE, &newstate); if (ret != 0) return ret;
@@ -1074,6 +1075,7 @@ static int nfs4_open_recover(struct nfs4 return -ESTALE; } if (state->n_wronly != 0) { + clear_bit(NFS_O_WRONLY_STATE, &state->flags); ret = nfs4_open_recover_helper(opendata, FMODE_WRITE, &newstate); if (ret != 0) return ret;
@@ -1081,6 +1083,7 @@ static int nfs4_open_recover(struct nfs4 return -ESTALE; } if (state->n_rdonly != 0) { + clear_bit(NFS_O_RDONLY_STATE, &state->flags); ret = nfs4_open_recover_helper(opendata, FMODE_READ, &newstate); if (ret != 0) return ret;