diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-05-05 09:39:10 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-05 16:59:07 +0200 |
| commit | cb0ba6cc22f372a2d42f9f2afc5a35f432cc61e2 (patch) | |
| tree | ac75b2baca4c361a5a02e097482c31d88db42e09 /fs | |
| parent | e64e17a554746a7f794f3d480d06e4be530fc090 (diff) | |
| download | linux-stable-cb0ba6cc22f372a2d42f9f2afc5a35f432cc61e2.tar.gz linux-stable-cb0ba6cc22f372a2d42f9f2afc5a35f432cc61e2.tar.bz2 linux-stable-cb0ba6cc22f372a2d42f9f2afc5a35f432cc61e2.zip | |
xfs: remove uuid_getnodeuniq and xfs_uu_t
Opencode uuid_getnodeuniq in the only caller, and directly decode
the uuid_t representation instead of using a structure cast for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/uuid.c | 25 | ||||
| -rw-r--r-- | fs/xfs/uuid.h | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_mount.c | 5 |
3 files changed, 4 insertions, 27 deletions
diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c index 29ed78c8637b..737c186ea98b 100644 --- a/fs/xfs/uuid.c +++ b/fs/xfs/uuid.c @@ -17,31 +17,6 @@ */ #include <xfs.h> -/* IRIX interpretation of an uuid_t */ -typedef struct { - __be32 uu_timelow; - __be16 uu_timemid; - __be16 uu_timehi; - __be16 uu_clockseq; - __be16 uu_node[3]; -} xfs_uu_t; - -/* - * 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_uu_t *uup = (xfs_uu_t *)uuid; - - fsid[0] = (be16_to_cpu(uup->uu_clockseq) << 16) | - be16_to_cpu(uup->uu_timemid); - fsid[1] = be32_to_cpu(uup->uu_timelow); -} - int uuid_is_nil(uuid_t *uuid) { diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h index 86bbed071e79..5aea49bf0963 100644 --- a/fs/xfs/uuid.h +++ b/fs/xfs/uuid.h @@ -19,6 +19,5 @@ #define __XFS_SUPPORT_UUID_H__ extern int uuid_is_nil(uuid_t *uuid); -extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]); #endif /* __XFS_SUPPORT_UUID_H__ */ diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 2eaf81859166..51f7d03ef86c 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -793,7 +793,10 @@ 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); + mp->m_fixedfsid[0] = + (get_unaligned_be16(&sbp->sb_uuid.b[8]) << 16) | + get_unaligned_be16(&sbp->sb_uuid.b[4]); + mp->m_fixedfsid[1] = get_unaligned_be32(&sbp->sb_uuid.b[0]); mp->m_dmevmask = 0; /* not persistent; set after each mount */ |