47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
|
From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||
|
|
Date: Tue, 2 Feb 2016 10:07:22 +0100
|
||
|
|
Subject: [PATCH] mountd: Add check for 'struct file_handle'
|
||
|
|
|
||
|
|
The code to check if name_to_handle_at() is implemented generates only a
|
||
|
|
warning but with some toolchain it doesn't fail to link (the function must be
|
||
|
|
implemented somewhere).
|
||
|
|
However the "struct file_handle" type is not available.
|
||
|
|
|
||
|
|
So, this patch adds a check for this struct.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||
|
|
---
|
||
|
|
configure.ac | 1 +
|
||
|
|
utils/mountd/cache.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 25d2ba4..913a86f 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -425,6 +425,7 @@ AC_TYPE_PID_T
|
||
|
|
AC_TYPE_SIZE_T
|
||
|
|
AC_HEADER_TIME
|
||
|
|
AC_STRUCT_TM
|
||
|
|
+AC_CHECK_TYPES([struct file_handle])
|
||
|
|
|
||
|
|
dnl *************************************************************
|
||
|
|
dnl Check for functions
|
||
|
|
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
|
||
|
|
index 7847446..dc64f6d 100644
|
||
|
|
--- a/utils/mountd/cache.c
|
||
|
|
+++ b/utils/mountd/cache.c
|
||
|
|
@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len)
|
||
|
|
if (count_slashes(p) != count_slashes(parent))
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
-#if HAVE_NAME_TO_HANDLE_AT
|
||
|
|
+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE)
|
||
|
|
struct {
|
||
|
|
struct file_handle fh;
|
||
|
|
unsigned char handle[128];
|
||
|
|
--
|
||
|
|
2.7.0
|
||
|
|
|