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/xfs/xfs_mount.c | |
| parent | S390/sysinfo: use uuid_is_null instead of opencoding it (diff) | |
| download | linux-dev-cb0ba6cc22f372a2d42f9f2afc5a35f432cc61e2.tar.xz linux-dev-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/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 */ |