ocfs2: remove unused errmsg function and table

dlm_errmsg() has been unused since 2010's commit 0016eedc4185
("ocfs2_dlmfs: Use the stackglue.")

Remove dlm_errmsg() and the message table it indexes.

Link: https://lkml.kernel.org/r/20241022002543.302606-1-linux@treblig.org
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/ocfs2/dlm/dlmapi.h b/fs/ocfs2/dlm/dlmapi.h
index bae60ca..847a52d 100644 (file)
--- a/fs/ocfs2/dlm/dlmapi.h
+++ b/fs/ocfs2/dlm/dlmapi.h
@@ -62,8 +62,6 @@ enum dlm_status {
        DLM_MAXSTATS,             /* 41: upper limit for return code validation */
 };
 
-/* for pretty-printing dlm_status error messages */
-const char *dlm_errmsg(enum dlm_status err);
 /* for pretty-printing dlm_status error names */
 const char *dlm_errname(enum dlm_status err);
 

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index be5e9ed..e9ef4e2 100644 (file)
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -164,59 +164,6 @@ static const char *dlm_errnames[] = {
        [DLM_MAXSTATS] =                "DLM_MAXSTATS",
 };
 
-static const char *dlm_errmsgs[] = {
-       [DLM_NORMAL] =                  "request in progress",
-       [DLM_GRANTED] =                 "request granted",
-       [DLM_DENIED] =                  "request denied",
-       [DLM_DENIED_NOLOCKS] =          "request denied, out of system resources",
-       [DLM_WORKING] =                 "async request in progress",
-       [DLM_BLOCKED] =                 "lock request blocked",
-       [DLM_BLOCKED_ORPHAN] =          "lock request blocked by a orphan lock",
-       [DLM_DENIED_GRACE_PERIOD] =     "topological change in progress",
-       [DLM_SYSERR] =                  "system error",
-       [DLM_NOSUPPORT] =               "unsupported",
-       [DLM_CANCELGRANT] =             "can't cancel convert: already granted",
-       [DLM_IVLOCKID] =                "bad lockid",
-       [DLM_SYNC] =                    "synchronous request granted",
-       [DLM_BADTYPE] =                 "bad resource type",
-       [DLM_BADRESOURCE] =             "bad resource handle",
-       [DLM_MAXHANDLES] =              "no more resource handles",
-       [DLM_NOCLINFO] =                "can't contact cluster manager",
-       [DLM_NOLOCKMGR] =               "can't contact lock manager",
-       [DLM_NOPURGED] =                "can't contact purge daemon",
-       [DLM_BADARGS] =                 "bad api args",
-       [DLM_VOID] =                    "no status",
-       [DLM_NOTQUEUED] =               "NOQUEUE was specified and request failed",
-       [DLM_IVBUFLEN] =                "invalid resource name length",
-       [DLM_CVTUNGRANT] =              "attempted to convert ungranted lock",
-       [DLM_BADPARAM] =                "invalid lock mode specified",
-       [DLM_VALNOTVALID] =             "value block has been invalidated",
-       [DLM_REJECTED] =                "request rejected, unrecognized client",
-       [DLM_ABORT] =                   "blocked lock request cancelled",
-       [DLM_CANCEL] =                  "conversion request cancelled",
-       [DLM_IVRESHANDLE] =             "invalid resource handle",
-       [DLM_DEADLOCK] =                "deadlock recovery refused this request",
-       [DLM_DENIED_NOASTS] =           "failed to allocate AST",
-       [DLM_FORWARD] =                 "request must wait for primary's response",
-       [DLM_TIMEOUT] =                 "timeout value for lock has expired",
-       [DLM_IVGROUPID] =               "invalid group specification",
-       [DLM_VERS_CONFLICT] =           "version conflicts prevent request handling",
-       [DLM_BAD_DEVICE_PATH] =         "Locks device does not exist or path wrong",
-       [DLM_NO_DEVICE_PERMISSION] =    "Client has insufficient perms for device",
-       [DLM_NO_CONTROL_DEVICE] =       "Cannot set options on opened device ",
-       [DLM_RECOVERING] =              "lock resource being recovered",
-       [DLM_MIGRATING] =               "lock resource being migrated",
-       [DLM_MAXSTATS] =                "invalid error number",
-};
-
-const char *dlm_errmsg(enum dlm_status err)
-{
-       if (err >= DLM_MAXSTATS || err < 0)
-               return dlm_errmsgs[DLM_MAXSTATS];
-       return dlm_errmsgs[err];
-}
-EXPORT_SYMBOL_GPL(dlm_errmsg);
-
 const char *dlm_errname(enum dlm_status err)
 {
        if (err >= DLM_MAXSTATS || err < 0)