From: Darrick J. Wong <djwong@xxxxxxxxxx>
We don't use this anymore, so get rid of it.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/Kconfig | 1 -
fs/xfs/xfs_linux.h | 1 -
fs/xfs/xfs_mount.c | 13 -------------
fs/xfs/xfs_mount.h | 3 ---
fs/xfs/xfs_sha512.h | 42 ------------------------------------------
fs/xfs/xfs_super.c | 3 ---
6 files changed, 63 deletions(-)
delete mode 100644 fs/xfs/xfs_sha512.h
diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 6422daaf8914..4798a147fd9e 100644
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -5,7 +5,6 @@ config XFS_FS
select EXPORTFS
select LIBCRC32C
select FS_IOMAP
- select CRYPTO_SHA512
help
XFS is a high performance journaling filesystem which originated
on the SGI IRIX platform. It is completely multi-threaded, can
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 3f93a742b896..c05f7e309c3e 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -62,7 +62,6 @@ typedef __u32 xfs_nlink_t;
#include <linux/rhashtable.h>
#include <linux/xattr.h>
#include <linux/mnt_idmapping.h>
-#include <crypto/hash.h>
#include <asm/page.h>
#include <asm/div64.h>
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index a5f3dce658e9..fb87ffb48f7f 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -983,19 +983,6 @@ xfs_mountfs(
goto out_agresv;
}
- if (xfs_has_parent(mp)) {
- struct crypto_shash *tfm;
-
- tfm = crypto_alloc_shash("sha512", 0, 0);
- if (IS_ERR(tfm)) {
- error = PTR_ERR(tfm);
- goto out_agresv;
- }
- xfs_info(mp, "parent pointer hash %s",
- crypto_shash_driver_name(tfm));
- mp->m_sha512 = tfm;
- }
-
return 0;
out_agresv:
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 7c8e15e84cd6..c08f55cc4f36 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -244,9 +244,6 @@ typedef struct xfs_mount {
#endif
/* Hook to feed file directory updates to an active online repair. */
struct xfs_hooks m_dirent_update_hooks;
-
- /* sha512 engine, if needed */
- struct crypto_shash *m_sha512;
} xfs_mount_t;
#define M_IGEO(mp) (&(mp)->m_ino_geo)
diff --git a/fs/xfs/xfs_sha512.h b/fs/xfs/xfs_sha512.h
deleted file mode 100644
index d9756db63aa6..000000000000
--- a/fs/xfs/xfs_sha512.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2023 Oracle. All Rights Reserved.
- * Author: Darrick J. Wong <djwong@xxxxxxxxxx>
- */
-#ifndef __XFS_SHA512_H__
-#define __XFS_SHA512_H__
-
-struct sha512_state {
- union {
- struct shash_desc desc;
- char __desc[sizeof(struct shash_desc) + HASH_MAX_DESCSIZE];
- };
-};
-
-#define SHA512_DESC_ON_STACK(mp, name) \
- struct sha512_state name = { .desc.tfm = (mp)->m_sha512 }
-
-#define SHA512_DIGEST_SIZE 64
-
-static inline int sha512_init(struct sha512_state *md)
-{
- return crypto_shash_init(&md->desc);
-}
-
-static inline int sha512_done(struct sha512_state *md, unsigned char *out)
-{
- return crypto_shash_final(&md->desc, out);
-}
-
-static inline int sha512_process(struct sha512_state *md,
- const unsigned char *in, unsigned long inlen)
-{
- return crypto_shash_update(&md->desc, in, inlen);
-}
-
-static inline void sha512_erase(struct sha512_state *md)
-{
- memset(md, 0, sizeof(*md));
-}
-
-#endif /* __XFS_SHA512_H__ */
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 610d72353f39..0432a4a096e8 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -738,8 +738,6 @@ xfs_mount_free(
{
kfree(mp->m_rtname);
kfree(mp->m_logname);
- if (mp->m_sha512)
- crypto_free_shash(mp->m_sha512);
kmem_free(mp);
}
@@ -1963,7 +1961,6 @@ static int xfs_init_fs_context(
if (fc->sb_flags & SB_SYNCHRONOUS)
mp->m_features |= XFS_FEAT_WSYNC;
- mp->m_sha512 = NULL;
fc->s_fs_info = mp;
fc->ops = &xfs_context_ops;
