From patchwork Wed Aug 24 23:38:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 1094612 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7ONc8lT024773 for ; Wed, 24 Aug 2011 23:38:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375Ab1HXXi1 (ORCPT ); Wed, 24 Aug 2011 19:38:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46233 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054Ab1HXXi0 (ORCPT ); Wed, 24 Aug 2011 19:38:26 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id B589C8B2F9; Thu, 25 Aug 2011 01:38:25 +0200 (CEST) Date: Thu, 25 Aug 2011 09:38:16 +1000 From: NeilBrown To: Boaz Harrosh Cc: Trond Myklebust , NFS Subject: Re: PATCH/RFC: remove state from struct nfs4_state Message-ID: <20110825093816.6e97db62@notabene.brown> In-Reply-To: <4E55869B.9010402@panasas.com> References: <20110825084601.4d8fcdee@notabene.brown> <4E55869B.9010402@panasas.com> X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.1; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 24 Aug 2011 23:38:28 +0000 (UTC) On Wed, 24 Aug 2011 16:17:47 -0700 Boaz Harrosh wrote: > On 08/24/2011 03:46 PM, NeilBrown wrote: > > > > > 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);