linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [nfs-utils PATCH 1/1] mountd: Fix compilation for --disable-uuid
@ 2019-11-18 14:31 Petr Vorel
  2019-11-18 16:30 ` Steve Dickson
  0 siblings, 1 reply; 2+ messages in thread
From: Petr Vorel @ 2019-11-18 14:31 UTC (permalink / raw)
  To: linux-nfs; +Cc: Petr Vorel

Although code in configure.ac pretends to set USE_BLKID as 0
via AC_DEFINE_UNQUOTED, it's actually not defined
support/include/config.h.in
support/include/config.h
/* #undef USE_BLKID */

Fixes: 8e643554 ("Allow disabling of libblkid usage.")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 utils/mountd/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 31e9507d..e5186c78 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -221,7 +221,7 @@ static void auth_unix_gid(int f)
 		xlog(L_ERROR, "auth_unix_gid: error writing reply");
 }
 
-#if USE_BLKID
+#ifdef USE_BLKID
 static const char *get_uuid_blkdev(char *path)
 {
 	/* We set *safe if we know that we need the
-- 
2.23.0


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

* Re: [nfs-utils PATCH 1/1] mountd: Fix compilation for --disable-uuid
  2019-11-18 14:31 [nfs-utils PATCH 1/1] mountd: Fix compilation for --disable-uuid Petr Vorel
@ 2019-11-18 16:30 ` Steve Dickson
  0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2019-11-18 16:30 UTC (permalink / raw)
  To: Petr Vorel, linux-nfs



On 11/18/19 9:31 AM, Petr Vorel wrote:
> Although code in configure.ac pretends to set USE_BLKID as 0
> via AC_DEFINE_UNQUOTED, it's actually not defined
> support/include/config.h.in
> support/include/config.h
> /* #undef USE_BLKID */
> 
> Fixes: 8e643554 ("Allow disabling of libblkid usage.")
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Committed! Thanks!!  (tag: nfs-utils-2-4-3-rc1)

steved.
> ---
>  utils/mountd/cache.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
> index 31e9507d..e5186c78 100644
> --- a/utils/mountd/cache.c
> +++ b/utils/mountd/cache.c
> @@ -221,7 +221,7 @@ static void auth_unix_gid(int f)
>  		xlog(L_ERROR, "auth_unix_gid: error writing reply");
>  }
>  
> -#if USE_BLKID
> +#ifdef USE_BLKID
>  static const char *get_uuid_blkdev(char *path)
>  {
>  	/* We set *safe if we know that we need the
> 


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

end of thread, other threads:[~2019-11-18 16:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 14:31 [nfs-utils PATCH 1/1] mountd: Fix compilation for --disable-uuid Petr Vorel
2019-11-18 16:30 ` Steve Dickson

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).