----- "Trond Myklebust" <Trond.Myklebust@xxxxxxxxxx> wrote:
> Yup. That makes sense. Does the following patch help?
>
> Cheers
> Trond
> --------------------------------------------------------------------------------------------------------
> NFSv4: Fix open recovery
>
> From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
>
> 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 <sprabhu@xxxxxxxxxx>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
> ---
>
> 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 089da5b..01b4817 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -1120,6 +1120,7 @@ static int nfs4_open_recover(struct
> nfs4_opendata *opendata, struct nfs4_state *
> 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;
> @@ -1127,6 +1128,7 @@ static int nfs4_open_recover(struct
> nfs4_opendata *opendata, struct nfs4_state *
> 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;
> @@ -1134,6 +1136,7 @@ static int nfs4_open_recover(struct
> nfs4_opendata *opendata, struct nfs4_state *
> 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;
>
Yes. The patch works.
As expected, repeated open calls are made with claim-type set to NULL. For each of these calls, a NFS4ERR_GRACE is returned by the server as long as it is in Grace period. Once the grace period has completed, the open call succeeds, a new stateid is set and the write operation continues.
Thank You
Sachin Prabhu
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
