From: Benny Halevy Subject: [PATCH] NFSD: do not return nfserr_symlink for the LINK operation Date: Thu, 19 Mar 2009 08:51:01 +0200 Message-ID: <49C1EB55.8060700@panasas.com> References: <49AF9C28.8030603@cn.fujitsu.com> <49AFA4E4.50207@panasas.com> <20090306213234.GB1779@fieldses.org> <49B2C404.3060907@panasas.com> <20090309180643.GB9408@fieldses.org> <49BA15B3.2040904@cn.fujitsu.com> <20090318230621.GK18894@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: Yang Hongyang , Trond Myklebust , Ni Wenjuan , linux-nfs@vger.kernel.org To: "J. Bruce Fields" Return-path: Received: from gw-ca.panasas.com ([209.116.51.66]:15180 "EHLO laguna.int.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754360AbZCSGvH (ORCPT ); Thu, 19 Mar 2009 02:51:07 -0400 In-Reply-To: <20090318230621.GK18894@fieldses.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: As reported by Ni Wenjuan on 2009-03-05: > the result of newpynfs test case of LINK4a . if you link with target directoty > is a symbole file,it should get NFS4ERR_NOTDIR ,instead got NFS4ERR_SYMLINK. THE LINK operation doesn't list NFS4ERR_SYMLINK as a valid error in the spec. Although NFS4ERR_SYMLINK seems like a reasonable error and even though it was added for LINK in NFSv4.1 we should still return NFSERR_NOTDIR for nfsv[234]. Signed-off-by: Benny Halevy --- fs/nfsd/vfs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6e50aaa..9165b1f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1637,6 +1637,9 @@ out_dput: out_unlock: fh_unlock(ffhp); out: + /* nfserr_symlink returned from fh_verify is inappropriate for LINK */ + if (err == nfserr_symlink) + err = nfserr_notdir; return err; out_nfserr: