public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: Bernhard Voelker <mail@bernhard-voelker.de>
To: Util-Linux <util-linux@vger.kernel.org>
Subject: [PATCH] libmount: define BTRFS_TEST_MAGIC if missing
Date: Wed, 05 Mar 2014 11:55:34 +0100	[thread overview]
Message-ID: <531702A6.2070903@bernhard-voelker.de> (raw)

The patch below avoid the following compile error:

   libmount/src/utils.c: In function 'mnt_statfs_get_fstype':
   libmount/src/utils.c:397:7: error: 'BTRFS_TEST_MAGIC' undeclared (first use in this function)
     case BTRFS_TEST_MAGIC:  return "btrfs";
          ^
   libmount/src/utils.c:397:7: note: each undeclared identifier is reported only once for each function it appears in

Have a nice day,
Berny


 From 2a5ed00775aa558a71be462c05ded86ad3e632d9 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Wed, 5 Mar 2014 11:52:13 +0100
Subject: [PATCH] libmount: define BTRFS_TEST_MAGIC if missing

* libmount/src/utils.c (BTRFS_TEST_MAGIC): Conditionally add define
which is used since commit v2.24-243-g6a52473.

Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
---
  libmount/src/utils.c | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index d402b7e..2541a22 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -333,6 +333,9 @@ int mnt_fstype_is_netfs(const char *type)
  #ifndef CONFIGFS_SUPER_MAGIC
  # define CONFIGFS_SUPER_MAGIC	0x62656570
  #endif
+#ifndef BTRFS_TEST_MAGIC
+# define BTRFS_TEST_MAGIC	0x73727279
+#endif

  const char *mnt_statfs_get_fstype(struct statfs *vfs)
  {
-- 
1.8.4.2


             reply	other threads:[~2014-03-05 10:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05 10:55 Bernhard Voelker [this message]
2014-03-05 11:27 ` [PATCH] libmount: define BTRFS_TEST_MAGIC if missing Karel Zak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=531702A6.2070903@bernhard-voelker.de \
    --to=mail@bernhard-voelker.de \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox