From patchwork Wed Aug 31 19:53:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 1117602 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 p7VJrVYI008851 for ; Wed, 31 Aug 2011 19:53:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169Ab1HaTxa (ORCPT ); Wed, 31 Aug 2011 15:53:30 -0400 Received: from fieldses.org ([174.143.236.118]:51802 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754134Ab1HaTxa (ORCPT ); Wed, 31 Aug 2011 15:53:30 -0400 Received: from bfields by fieldses.org with local (Exim 4.72) (envelope-from ) id 1Qyqqn-00058X-C0; Wed, 31 Aug 2011 15:53:29 -0400 Date: Wed, 31 Aug 2011 15:53:29 -0400 To: linux-nfs@vger.kernel.org Cc: Casey Bodley Subject: [PATCH] nfsd4: in-stateid seqid should start with 1 Message-ID: <20110831195329.GD19223@fieldses.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) From: "J. Bruce Fields" 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, 31 Aug 2011 19:53:35 +0000 (UTC) From: J. Bruce Fields Thanks to Casey for reminding me that 5661 gives a special meaning to a value of 0 in the stateid's seqid field, so we should instead be starting out stateid's with si_generation 1. Reported-by: Casey Bodley Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 49c3dd1..7caa812 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -251,7 +251,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f dp->dl_stateid.si_boot = boot_time; dp->dl_stateid.si_stateownerid = current_delegid++; dp->dl_stateid.si_fileid = 0; - dp->dl_stateid.si_generation = 0; + dp->dl_stateid.si_generation = 1; fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); dp->dl_time = 0; atomic_set(&dp->dl_count, 1); @@ -2303,7 +2303,7 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open * stp->st_stateid.si_boot = boot_time; stp->st_stateid.si_stateownerid = oo->oo_owner.so_id; stp->st_stateid.si_fileid = fp->fi_id; - stp->st_stateid.si_generation = 0; + stp->st_stateid.si_generation = 1; stp->st_access_bmap = 0; stp->st_deny_bmap = 0; __set_bit(open->op_share_access & ~NFS4_SHARE_WANT_MASK, @@ -3898,7 +3898,7 @@ alloc_init_lock_stateid(struct nfs4_lockowner *lo, struct nfs4_file *fp, struct stp->st_stateid.si_boot = boot_time; stp->st_stateid.si_stateownerid = lo->lo_owner.so_id; stp->st_stateid.si_fileid = fp->fi_id; - stp->st_stateid.si_generation = 0; + stp->st_stateid.si_generation = 1; stp->st_access_bmap = 0; stp->st_deny_bmap = open_stp->st_deny_bmap; stp->st_openstp = open_stp;