PATCH/RFC: remove state from struct nfs4_state

Commit Message

NeilBrown Aug. 24, 2011, 11:38 p.m. UTC

On Wed, 24 Aug 2011 16:17:47 -0700 Boaz Harrosh <[e-mail]> wrote:

> On 08/24/2011 03:46 PM, NeilBrown wrote:
> > 
> <snip>
> > diff --git a/include/linux/configfs.h b/include/linux/configfs.h
> > index 3081c58..9723858 100644
> > --- a/include/linux/configfs.h
> > +++ b/include/linux/configfs.h
> > @@ -15,8 +15,8 @@
> >   *
> >   * You should have received a copy of the GNU General Public
> >   * License along with this program; if not, write to the
> > - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> > - * Boston, MA 021110-1307, USA.
> > + * Free Software Foundation, Inc.,
> > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> 
> You did not mean to add all these changes in this particular
> patch, did you?

Oops.... I thought it was a clean tree that I was working with.  Sorry.

> 
> If you are at fixing this (snail mail) address. Can't you just
> remove the darn thing, that no one ever care about. I thing
> you don't need any address. But the most it should just be an
> email. Please don't let us slave every time FSF changes the rent
> (As your patch said about something else this address is set but
>  is never used. Proof of - It was wrong for so many years and no
>  one was hurt ;-) )
:-)

It is certainly wrong having a wrong address.  We should either fix it or
remove it.  The GPL under which the source is released seems to suggest that
it should be fixed.  But that isn't really a topic for this email.

This is the only part of the patch that I meant to send.

Thanks,
NeilBrown


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 1ec1a85..36639a0 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -211,7 +211,6 @@  struct nfs4_state {
 struct nfs4_exception {
 	long timeout;
 	int retry;
-	struct nfs4_state *state;
 };
 
 struct nfs4_state_recovery_ops {
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8c77039..8c99ee4 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -257,7 +257,6 @@  static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
 static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struct nfs4_exception *exception)
 {
 	struct nfs_client *clp = server->nfs_client;
-	struct nfs4_state *state = exception->state;
 	int ret = errorcode;
 
 	exception->retry = 0;
@@ -267,13 +266,8 @@  static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
 		case -NFS4ERR_ADMIN_REVOKED:
 		case -NFS4ERR_BAD_STATEID:
 		case -NFS4ERR_OPENMODE:
-			if (state == NULL)
-				break;
-			nfs4_schedule_stateid_recovery(server, state);
-			goto wait_on_recovery;
+			break;
 		case -NFS4ERR_EXPIRED:
-			if (state != NULL)
-				nfs4_schedule_stateid_recovery(server, state);
 		case -NFS4ERR_STALE_STATEID:
 		case -NFS4ERR_STALE_CLIENTID:
 			nfs4_schedule_lease_recovery(clp);