From a803c4026cf44d47d8f6bcad0854078742699fb0 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sat, 17 Jul 2021 20:59:06 +0200
Subject: [PATCH] Kernel: Make FileSystem::class_name() return a StringView

---
 Kernel/FileSystem/DevFS.h            | 2 +-
 Kernel/FileSystem/DevPtsFS.h         | 2 +-
 Kernel/FileSystem/Ext2FileSystem.cpp | 5 -----
 Kernel/FileSystem/Ext2FileSystem.h   | 2 +-
 Kernel/FileSystem/FileSystem.h       | 2 +-
 Kernel/FileSystem/Plan9FileSystem.h  | 2 +-
 Kernel/FileSystem/ProcFS.h           | 2 +-
 Kernel/FileSystem/SysFS.h            | 2 +-
 Kernel/FileSystem/TmpFS.h            | 2 +-
 9 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Kernel/FileSystem/DevFS.h b/Kernel/FileSystem/DevFS.h
index b962998c6d4..60f071bc46d 100644
--- a/Kernel/FileSystem/DevFS.h
+++ b/Kernel/FileSystem/DevFS.h
@@ -23,7 +23,7 @@ public:
     static NonnullRefPtr<DevFS> create();
 
     virtual bool initialize() override;
-    virtual const char* class_name() const override { return "DevFS"; }
+    virtual StringView class_name() const override { return "DevFS"sv; }
 
     void notify_new_device(Device&);
     void notify_device_removal(Device&);
diff --git a/Kernel/FileSystem/DevPtsFS.h b/Kernel/FileSystem/DevPtsFS.h
index 3a1533ad223..72a046c1cfa 100644
--- a/Kernel/FileSystem/DevPtsFS.h
+++ b/Kernel/FileSystem/DevPtsFS.h
@@ -23,7 +23,7 @@ public:
     static NonnullRefPtr<DevPtsFS> create();
 
     virtual bool initialize() override;
-    virtual const char* class_name() const override { return "DevPtsFS"; }
+    virtual StringView class_name() const override { return "DevPtsFS"sv; }
 
     virtual NonnullRefPtr<Inode> root_inode() const override;
 
diff --git a/Kernel/FileSystem/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp
index 62a245c51ba..3df01433985 100644
--- a/Kernel/FileSystem/Ext2FileSystem.cpp
+++ b/Kernel/FileSystem/Ext2FileSystem.cpp
@@ -148,11 +148,6 @@ bool Ext2FS::initialize()
     return true;
 }
 
-const char* Ext2FS::class_name() const
-{
-    return "Ext2FS";
-}
-
 NonnullRefPtr<Inode> Ext2FS::root_inode() const
 {
     return *get_inode({ fsid(), EXT2_ROOT_INO });
diff --git a/Kernel/FileSystem/Ext2FileSystem.h b/Kernel/FileSystem/Ext2FileSystem.h
index 7c70053cb01..0f7a5b2b145 100644
--- a/Kernel/FileSystem/Ext2FileSystem.h
+++ b/Kernel/FileSystem/Ext2FileSystem.h
@@ -128,7 +128,7 @@ private:
 
     bool flush_super_block();
 
-    virtual const char* class_name() const override;
+    virtual StringView class_name() const override { return "Ext2FS"sv; }
     virtual NonnullRefPtr<Inode> root_inode() const override;
     RefPtr<Inode> get_inode(InodeIdentifier) const;
     KResultOr<NonnullRefPtr<Inode>> create_inode(Ext2FSInode& parent_inode, const String& name, mode_t, dev_t, uid_t, gid_t);
diff --git a/Kernel/FileSystem/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index d440e4cfe9d..72d621508c0 100644
--- a/Kernel/FileSystem/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
@@ -32,7 +32,7 @@ public:
     static void lock_all();
 
     virtual bool initialize() = 0;
-    virtual const char* class_name() const = 0;
+    virtual StringView class_name() const = 0;
     virtual NonnullRefPtr<Inode> root_inode() const = 0;
     virtual bool supports_watchers() const { return false; }
 
diff --git a/Kernel/FileSystem/Plan9FileSystem.h b/Kernel/FileSystem/Plan9FileSystem.h
index ddb8debb122..0c79fdaf11b 100644
--- a/Kernel/FileSystem/Plan9FileSystem.h
+++ b/Kernel/FileSystem/Plan9FileSystem.h
@@ -113,7 +113,7 @@ private:
     };
     friend class Blocker;
 
-    virtual const char* class_name() const override { return "Plan9FS"; }
+    virtual StringView class_name() const override { return "Plan9FS"sv; }
 
     bool is_complete(const ReceiveCompletion&);
     KResult post_message(Message&, RefPtr<ReceiveCompletion>);
diff --git a/Kernel/FileSystem/ProcFS.h b/Kernel/FileSystem/ProcFS.h
index fb9b4a7ead4..efeb8ed38b1 100644
--- a/Kernel/FileSystem/ProcFS.h
+++ b/Kernel/FileSystem/ProcFS.h
@@ -26,7 +26,7 @@ public:
     static RefPtr<ProcFS> create();
 
     virtual bool initialize() override;
-    virtual const char* class_name() const override { return "ProcFS"; }
+    virtual StringView class_name() const override { return "ProcFS"sv; }
 
     virtual NonnullRefPtr<Inode> root_inode() const override;
 
diff --git a/Kernel/FileSystem/SysFS.h b/Kernel/FileSystem/SysFS.h
index 7cff37b070e..25cc4c237f3 100644
--- a/Kernel/FileSystem/SysFS.h
+++ b/Kernel/FileSystem/SysFS.h
@@ -49,7 +49,7 @@ public:
     static NonnullRefPtr<SysFS> create();
 
     virtual bool initialize() override;
-    virtual char const* class_name() const override { return "SysFS"; }
+    virtual StringView class_name() const override { return "SysFS"sv; }
 
     virtual NonnullRefPtr<Inode> root_inode() const override;
 
diff --git a/Kernel/FileSystem/TmpFS.h b/Kernel/FileSystem/TmpFS.h
index ffdb7de94a9..178b17bddc0 100644
--- a/Kernel/FileSystem/TmpFS.h
+++ b/Kernel/FileSystem/TmpFS.h
@@ -24,7 +24,7 @@ public:
     static RefPtr<TmpFS> create();
     virtual bool initialize() override;
 
-    virtual const char* class_name() const override { return "TmpFS"; }
+    virtual StringView class_name() const override { return "TmpFS"sv; }
 
     virtual bool supports_watchers() const override { return true; }