From: Amir Goldstein <amir73il@gmail.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
Miklos Szeredi <miklos@szeredi.hu>, Theodore Tso <tytso@mit.edu>,
Richard Weinberger <richard@nod.at>,
Mark Fasheh <mfasheh@versity.com>,
Dan Williams <dan.j.williams@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
David Howells <dhowells@redhat.com>, Shaohua Li <shli@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-xfs@vger.kernel.org, linux-unionfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 4/8] xfs: namespace the helper uuid_getnodeuniq()
Date: Thu, 4 May 2017 16:26:19 +0300 [thread overview]
Message-ID: <1493904383-2187-5-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1493904383-2187-1-git-send-email-amir73il@gmail.com>
uuid_getnodeuniq(), as the comment says, 'is not in any way
a standard or condoned UUID function'.
Therefore, prefix the helper name with xfs_ to differentiate it
from the rest of the common uuid_ helpers.
The uuid_ helpers are about to be hoisted to lib/uuid.c.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/xfs/uuid.c | 4 ++--
fs/xfs/uuid.h | 2 +-
fs/xfs/xfs_mount.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c
index 7bb4fb8..16958e7 100644
--- a/fs/xfs/uuid.c
+++ b/fs/xfs/uuid.c
@@ -18,13 +18,13 @@
#include <xfs.h>
/*
- * uuid_getnodeuniq - obtain the node unique fields of a UUID.
+ * xfs_uuid_getnodeuniq - obtain the node unique fields of a UUID.
*
* This is not in any way a standard or condoned UUID function;
* it just something that's needed for user-level file handles.
*/
void
-uuid_getnodeuniq(uuid_t *uuid, int fsid [2])
+xfs_uuid_getnodeuniq(uuid_t *uuid, int fsid[2])
{
fsid[0] = (uuid->clock_seq_hi_and_reserved << 24) |
(uuid->clock_seq_low << 16) |
diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h
index 0e3ecd0..b40dee7 100644
--- a/fs/xfs/uuid.h
+++ b/fs/xfs/uuid.h
@@ -22,7 +22,7 @@
extern int uuid_is_nil(uuid_t *uuid);
extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2);
-extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]);
+extern void xfs_uuid_getnodeuniq(uuid_t *uuid, int fsid[2]);
static inline void
uuid_copy(uuid_t *dst, uuid_t *src)
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 4c0d8d7..f4fdce7 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -794,7 +794,7 @@ xfs_mountfs(
* Copies the low order bits of the timestamp and the randomly
* set "sequence" number out of a UUID.
*/
- uuid_getnodeuniq(&sbp->sb_uuid, mp->m_fixedfsid);
+ xfs_uuid_getnodeuniq(&sbp->sb_uuid, mp->m_fixedfsid);
mp->m_dmevmask = 0; /* not persistent; set after each mount */
--
2.7.4
next prev parent reply other threads:[~2017-05-04 13:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 13:26 [PATCH v2 0/8] hoist uuid helpers from xfs to linux/uuid.h Amir Goldstein
2017-05-04 13:26 ` [PATCH v2 1/8] xfs: use uuid_copy() helper to abstract uuid_t Amir Goldstein
2017-05-04 13:31 ` Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 2/8] xfs: re-define uuid_t as common struct uuid_v1 Amir Goldstein
2017-05-04 13:34 ` Christoph Hellwig
2017-05-04 13:57 ` Amir Goldstein
2017-05-04 13:59 ` Christoph Hellwig
2017-05-04 14:00 ` Amir Goldstein
2017-05-04 14:01 ` Christoph Hellwig
2017-05-04 14:16 ` David Howells
2017-05-04 14:18 ` Christoph Hellwig
2017-05-04 14:36 ` David Howells
2017-05-04 13:26 ` [PATCH v2 3/8] xfs: dismiss xfs_uu_t Amir Goldstein
2017-05-04 13:35 ` Christoph Hellwig
2017-05-04 13:26 ` Amir Goldstein [this message]
2017-05-04 13:28 ` [PATCH v2 4/8] xfs: namespace the helper uuid_getnodeuniq() Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 5/8] md: namespace private helper names Amir Goldstein
2017-05-04 13:26 ` [PATCH v2 6/8] linux/uuid.h: hoist helpers uuid_equal() and uuid_copy() from xfs Amir Goldstein
2017-05-04 13:26 ` [PATCH v2 7/8] linux/uuid.h: hoist uuid_is_null() helper from libnvdimm Amir Goldstein
2017-05-04 13:30 ` Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 8/8] xfs: use the common helper uuid_is_null() Amir Goldstein
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=1493904383-2187-5-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=dhowells@redhat.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mfasheh@versity.com \
--cc=miklos@szeredi.hu \
--cc=richard@nod.at \
--cc=shli@kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).