From patchwork Mon May 20 15:06:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goldwyn Rodriues X-Patchwork-Id: 2593771 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by patchwork2.kernel.org (Postfix) with ESMTP id 08AC6DF2A2 for ; Mon, 20 May 2013 15:10:50 +0000 (UTC) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r4KFAAPC015619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 20 May 2013 15:10:11 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4KFA7OV023127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 20 May 2013 15:10:07 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1UeRfu-0004us-9r; Mon, 20 May 2013 08:06:58 -0700 Received: from acsinet22.oracle.com ([141.146.126.238]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1UeRfU-0004tv-U6 for ocfs2-devel@oss.oracle.com; Mon, 20 May 2013 08:06:32 -0700 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r4KF6WRF013652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 May 2013 15:06:32 GMT Received: from mail-oa0-f44.google.com (mail-oa0-f44.google.com [209.85.219.44]) by aserp1030.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r4KF6VwU026208 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Mon, 20 May 2013 15:06:32 GMT Received: by mail-oa0-f44.google.com with SMTP id n12so7841792oag.3 for ; Mon, 20 May 2013 08:06:31 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.182.33.40 with SMTP id o8mr26928215obi.39.1369062391598; Mon, 20 May 2013 08:06:31 -0700 (PDT) Received: by 10.182.56.232 with HTTP; Mon, 20 May 2013 08:06:31 -0700 (PDT) Date: Mon, 20 May 2013 10:06:31 -0500 Message-ID: From: Goldwyn Rodrigues To: Ocfs2-Devel X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.219.44 ct-class=R5 ct-vol1=-90 ct-vol2=8 ct-vol3=7 ct-risk=54 ct-spam1=88 ct-spam2=6 ct-bulk=5 rcpts=1 size=618 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=VZzOYjZ9 c=1 sm=1 tr=0 a=/VoQ8Tt6iLxTAhWNWh7LYA==:117 a=akGW1AoKFpYA:10 a=nDghuxUhq_wA:10 a=8nJEP1OIZ-IA:10 a=pGLkceISAAAA:8 a=1XWaLZrsAAAA:8 a=yPCof4ZbAAAA:8 a=f2m1cxqfAxYA:10 a=iox4zFpeAAAA:8 a=pkUC15XbVe5U8i4vCjIA:9 a=wPNLvfG TeEIA:10 a=n9GBPR9yFnkA:10 X-Sendmail-CT-Classification: not spam X-Sendmail-CT-RefID: str=0001.0A090207.519A3BF8.0052, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 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: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] While removing a non-empty directory, the kernel dumps a message: (rmdir,21743,1):ocfs2_unlink:953 ERROR: status = -39 Suppress the error message from being printed in the dmesg so users don't panic. Signed-off-by: Goldwyn Rodrigues Acked-by: Sunil Mushran diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 04ee1b5..33c7b91 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -947,7 +947,7 @@ leave: ocfs2_free_dir_lookup_result(&orphan_insert); ocfs2_free_dir_lookup_result(&lookup); - if (status) + if (status && (status != -ENOTEMPTY)) mlog_errno(status); return status;