> - nfsd4_cleanup_open_state(open, status); > - if (open->op_openowner) > - nfsd4_cstate_assign_replay(cstate, > - &open->op_openowner->oo_owner); > + nfsd4_cleanup_open_state(cstate, open, status); This was just added in the last patch, seems like you should introduce this form of nfsd4_cleanup_open_state in the earlier patch. > index 6886135b82ec..4f518fb453b5 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -2951,6 +2951,27 @@ static void init_nfs4_replay(struct nfs4_replay *rp) > mutex_init(&rp->rp_mutex); > } > > +static void nfsd4_cstate_assign_replay(struct nfsd4_compound_state *cstate, > + struct nfs4_stateowner *so) > +void nfsd4_cstate_clear_replay(struct nfsd4_compound_state *cstate) And keep these in nfs4state.c from the start. -- 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
