From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752166AbdK3Siv (ORCPT <rfc822;w@1wt.eu>);
        Thu, 30 Nov 2017 13:38:51 -0500
Received: from mail-pf0-f196.google.com ([209.85.192.196]:32833 "EHLO
        mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751958AbdK3Sie (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 30 Nov 2017 13:38:34 -0500
X-Google-Smtp-Source: AGs4zMad9cBT1w9H1Dt+FL25rm4jsbjbDnKEwG3KRxZNHCYhHYO7wG0PMWLuc+4CMpFzh5OgQNdPGA==
Date: Thu, 30 Nov 2017 10:38:32 -0800 (PST)
X-Google-Original-Date: Thu, 30 Nov 2017 10:38:28 PST (-0800)
Subject: Re: [patches] Re: [PATCH 08/10] RISC-V: Set __ARCH_WANT_RENAMEAT to pick up generic version
In-Reply-To: <20171130183032.GA28365@infradead.org>
CC: Olof Johansson <olof@lixom.net>, albert@sifive.com,
        patches@groups.riscv.org, linux-kernel@vger.kernel.org,
        Arnd Bergmann <arnd@arndb.de>
From: Palmer Dabbelt <palmer@sifive.com>
To: Christoph Hellwig <hch@infradead.org>
Message-ID: <mhng-81e38176-6ac2-4c03-8dbe-b3194494a5b8@palmer-si-x1c4>
Mime-Version: 1.0 (MHng)
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 30 Nov 2017 10:30:32 PST (-0800), Christoph Hellwig wrote:
> On Wed, Nov 29, 2017 at 05:55:19PM -0800, Olof Johansson wrote:
>> In file included from ../lib/audit.c:8:0:
>> ../include/asm-generic/audit_dir_write.h:30:1: error: '__NR_renameat' undeclared here (not in a function); did you mean '__NR_renameat2'?
>
>
> I think the audit code should be fixed instead to not expect
> __NR_renameat, gіven that it's not in the asm-generic default set.

For some reason I thought we'd decided to keep renameat in our port despite it 
no longer being in the default list so we could maintain some backwards 
compatibility, but after looking through my email it looks like I was wrong 
about that.

I'm just going to drop this patch for now.  I haven't tried it, but I think 
this might just do the trick?

diff --git a/include/asm-generic/audit_dir_write.h b/include/asm-generic/audit_dir_write.h
index da09fb986459..dd5a9dd7a102 100644
--- a/include/asm-generic/audit_dir_write.h
+++ b/include/asm-generic/audit_dir_write.h
@@ -27,7 +27,9 @@ __NR_mknod,
 __NR_mkdirat,
 __NR_mknodat,
 __NR_unlinkat,
+#ifdef __NR_renameat
 __NR_renameat,
+#endif
 __NR_linkat,
 __NR_symlinkat,
 #endif