trinity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/7] trinity: Fix compile error on linux 4.15 kernel
@ 2018-02-06  8:02 Thomas Richter
  2018-02-06  8:02 ` [PATCH 2/7] trinity: Update and comment on s390 system call table Thomas Richter
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Thomas Richter @ 2018-02-06  8:02 UTC (permalink / raw)
  To: trinity, davej; +Cc: brueckner, schwidefsky, heiko.carstens, Thomas Richter

Commit 1f28c5d055032e7e8ee5e48198dca7e125d0eec6
("autofs: remove unused AUTOFS_IOC_EXPIRE_DIRECT/INDIRECT")

in the linux kernel removed the 2 defines
AUTOFS_IOC_EXPIRE_INDIRECT
AUTOFS_IOC_EXPIRE_DIRECT

Since they are used unconditionally the build fails.
To fix this add #ifdef/#endif around it.

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
---
 ioctls/autofs.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ioctls/autofs.c b/ioctls/autofs.c
index a39ccccc..03eacaae 100644
--- a/ioctls/autofs.c
+++ b/ioctls/autofs.c
@@ -239,8 +239,15 @@ static const struct ioctl autofs_ioctls[] = {
 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
 	IOCTL(AUTOFS_IOC_EXPIRE),
 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
+	/* Both defines removed by kernel commit
+	 * 1f28c5d055032e7e8ee5e48198dca7e125d0eec6
+	 */
+#ifdef AUTOFS_IOC_EXPIRE_INDIRECT
 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+#endif
+#ifdef AUTOFS_IOC_EXPIRE_DIRECT
 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
+#endif
 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
 
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-02-06  8:02 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-06  8:02 [PATCH 1/7] trinity: Fix compile error on linux 4.15 kernel Thomas Richter
2018-02-06  8:02 ` [PATCH 2/7] trinity: Update and comment on s390 system call table Thomas Richter
2018-02-06  8:02 ` [PATCH 3/7] trinity: Add support for preadv2/pwritev2 svcs Thomas Richter
2018-02-06  8:02 ` [PATCH 4/7] trinity: Add support for statx svc Thomas Richter
2018-02-06  8:02 ` [PATCH 5/7] trinity: Add support for mlock2 svc Thomas Richter
2018-02-06  8:02 ` [PATCH 6/7] trinity: Add support for copy_file_range svc Thomas Richter
2018-02-06  8:02 ` [PATCH 7/7] trinity: Add support for readdir svc Thomas Richter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).