Re: [patches] Re: [PATCH 08/10] RISC-V: Set __ARCH_WANT_RENAMEAT to pick up generic version

From: Palmer Dabbelt
Date: Thu Nov 30 2017 - 13:38:54 EST


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