From patchwork Tue May 28 01:12:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: xiaowei Hu X-Patchwork-Id: 2621611 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by patchwork1.kernel.org (Postfix) with ESMTP id 6FCA93FDBC for ; Tue, 28 May 2013 01:15:21 +0000 (UTC) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r4S1Eksq031151 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 28 May 2013 01:14:46 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4S1EgKm003414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 28 May 2013 01:14:43 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1Uh8Rp-0002CV-Kg; Mon, 27 May 2013 18:11:33 -0700 Received: from acsinet22.oracle.com ([141.146.126.238]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1Uh8RY-0002Bi-Nt for ocfs2-devel@oss.oracle.com; Mon, 27 May 2013 18:11:16 -0700 Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4S1BFj6026553 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 28 May 2013 01:11:16 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4S1BFVh020154; Tue, 28 May 2013 01:11:15 GMT Received: from xiaowei-dell790.cn.oracle.com (/10.182.38.48) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 May 2013 18:11:14 -0700 From: xiaowei.hu@oracle.com To: Date: Tue, 28 May 2013 09:12:39 +0800 Message-Id: <1369703559-25053-1-git-send-email-xiaowei.hu@oracle.com> X-Mailer: git-send-email 1.7.11.7 Cc: joe.jin@oracle.com, rgoldwyn@suse.com Subject: [Ocfs2-devel] [PATCH]Remove unecessary ERROR when removing non-empty directory X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] From: "Xiaowei.Hu" Suppress the error message from being printed in ocfs2_rename Did same thing with Goldwyn Rodrigues last patch. While removing a non-empty directory, the kernel dumps a message: (mv,29521,1):ocfs2_rename:1474 ERROR: status = -39 Signed-off-by: Xiaowei Hu Reviewed-by: Jie Liu --- fs/ocfs2/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 50c93a8..8ef1776 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -1470,7 +1470,7 @@ bail: brelse(old_dir_bh); brelse(new_dir_bh); - if (status) + if (status && (status != -ENOTEMPTY)) mlog_errno(status); return status;