From patchwork Tue Nov 16 23:49:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Habermann X-Patchwork-Id: 330151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAGNnP6T002256 for ; Tue, 16 Nov 2010 23:49:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755789Ab0KPXtX (ORCPT ); Tue, 16 Nov 2010 18:49:23 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:40732 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553Ab0KPXtX convert rfc822-to-8bit (ORCPT ); Tue, 16 Nov 2010 18:49:23 -0500 Received: by gyh4 with SMTP id 4so812478gyh.19 for ; Tue, 16 Nov 2010 15:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=JZntcQtJb4Rb86cjAvOjqkP1M3MO975/78H1j5kj7uQ=; b=HHebdGrZx9byV50YMTM6wftXIifIq0EfHi3OZYeUvQYGPtl3mYFwUvnZVW/Mg0n8dy G2MmlS2neMVMQaEGy94e2uyORBT2P3RN3ZoQBtNN9Vcxq95oou0V8ARV2yeJXNdQGgaG l+D6YlafUszIOWKP3OBkr1NQlUCvjbeKtWBv0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=nU0wgVA+yI2032jY35G+cSIUEcIM5BvKlAwmvqILv4IGWAVyrQDEz9BJikwYD2KxlY kXV98pQpj+6bi1hGDEIFq4yyuUOQMu/sep7UN9Nxi+tbl01JsvoyK7W+OjioqrMQmFtN i1X4TGiSC1UiSVvYqGuZqx+ZQVpINAW4WyrAo= MIME-Version: 1.0 Received: by 10.150.145.16 with SMTP id s16mr4475942ybd.4.1289951362198; Tue, 16 Nov 2010 15:49:22 -0800 (PST) Received: by 10.151.148.1 with HTTP; Tue, 16 Nov 2010 15:49:22 -0800 (PST) In-Reply-To: <20101116185551.GD3971@fieldses.org> References: <20101116185551.GD3971@fieldses.org> Date: Tue, 16 Nov 2010 17:49:22 -0600 Message-ID: Subject: Re: incorrect EXDEV error occasionally returned for rename over NFS From: Joe Habermann To: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org 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.3 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Nov 2010 23:49:31 +0000 (UTC) --- vfs.c.orig 2011-02-10 18:39:30.000000000 -0600 +++ vfs.c 2011-02-10 18:39:46.000000000 -0600 @@ -1744,8 +1744,12 @@ nfsd_rename(struct svc_rqst *rqstp, stru tdir = tdentry->d_inode; err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev; - if (ffhp->fh_export != tfhp->fh_export) + if (ffhp->fh_export != tfhp->fh_export) { + if (ffhp->fh_export->ex_client != tfhp->fh_export->ex_client || + ffhp->fh_export->ex_path.dentry != tfhp->fh_export->ex_path.dentry || + ffhp->fh_export->ex_path.mnt != tfhp->fh_export->ex_path.mnt) goto out; + }