From patchwork Fri Dec 6 09:30:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Xiang X-Patchwork-Id: 3294121 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 694AEC0D4A for ; Fri, 6 Dec 2013 09:31:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF8F620444 for ; Fri, 6 Dec 2013 09:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA80B201DE for ; Fri, 6 Dec 2013 09:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090Ab3LFJbi (ORCPT ); Fri, 6 Dec 2013 04:31:38 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:12165 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753513Ab3LFJbg (ORCPT ); Fri, 6 Dec 2013 04:31:36 -0500 Received: from 172.24.2.119 (EHLO szxeml212-edg.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AHJ33930; Fri, 06 Dec 2013 17:31:34 +0800 (CST) Received: from SZXEML424-HUB.china.huawei.com (10.82.67.163) by szxeml212-edg.china.huawei.com (172.24.2.181) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 6 Dec 2013 17:30:48 +0800 Received: from localhost (10.135.72.188) by szxeml424-hub.china.huawei.com (10.82.67.163) with Microsoft SMTP Server id 14.3.158.1; Fri, 6 Dec 2013 17:30:43 +0800 From: Rui Xiang To: Trond Myklebust CC: , Rui Xiang Subject: [PATCH 2/2] nfs: fix return err if inode exiting in nfs_instantiate Date: Fri, 6 Dec 2013 17:30:17 +0800 Message-ID: <1386322217-27436-2-git-send-email-rui.xiang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1386322217-27436-1-git-send-email-rui.xiang@huawei.com> References: <1386322217-27436-1-git-send-email-rui.xiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.72.188] X-CFilter-Loop: Reflected Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In common function nfs_instantiate to create, mkdir, and mknod, if dentry->d_inode exits, it should return -EEXIST instead of -EACCES. Signed-off-by: Rui Xiang --- fs/nfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 2518865..e570b37 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1547,7 +1547,7 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, struct dentry *parent = dget_parent(dentry); struct inode *dir = parent->d_inode; struct inode *inode; - int error = -EACCES; + int error = -EEXIST; d_drop(dentry);