Skip to content

Commit 77e94b0

Browse files
Dr. David Alan Gilbertakpm00
authored andcommitted
ocfs2: remove unused errmsg function and table
dlm_errmsg() has been unused since 2010's commit 0016eed ("ocfs2_dlmfs: Use the stackglue.") Remove dlm_errmsg() and the message table it indexes. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Dr. David Alan Gilbert <[email protected]> Acked-by: Joseph Qi <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Jun Piao <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent b5e6049 commit 77e94b0

File tree

2 files changed

+0
-55
lines changed

2 files changed

+0
-55
lines changed

fs/ocfs2/dlm/dlmapi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ enum dlm_status {
6262
DLM_MAXSTATS, /* 41: upper limit for return code validation */
6363
};
6464

65-
/* for pretty-printing dlm_status error messages */
66-
const char *dlm_errmsg(enum dlm_status err);
6765
/* for pretty-printing dlm_status error names */
6866
const char *dlm_errname(enum dlm_status err);
6967

fs/ocfs2/dlm/dlmdebug.c

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -164,59 +164,6 @@ static const char *dlm_errnames[] = {
164164
[DLM_MAXSTATS] = "DLM_MAXSTATS",
165165
};
166166

167-
static const char *dlm_errmsgs[] = {
168-
[DLM_NORMAL] = "request in progress",
169-
[DLM_GRANTED] = "request granted",
170-
[DLM_DENIED] = "request denied",
171-
[DLM_DENIED_NOLOCKS] = "request denied, out of system resources",
172-
[DLM_WORKING] = "async request in progress",
173-
[DLM_BLOCKED] = "lock request blocked",
174-
[DLM_BLOCKED_ORPHAN] = "lock request blocked by a orphan lock",
175-
[DLM_DENIED_GRACE_PERIOD] = "topological change in progress",
176-
[DLM_SYSERR] = "system error",
177-
[DLM_NOSUPPORT] = "unsupported",
178-
[DLM_CANCELGRANT] = "can't cancel convert: already granted",
179-
[DLM_IVLOCKID] = "bad lockid",
180-
[DLM_SYNC] = "synchronous request granted",
181-
[DLM_BADTYPE] = "bad resource type",
182-
[DLM_BADRESOURCE] = "bad resource handle",
183-
[DLM_MAXHANDLES] = "no more resource handles",
184-
[DLM_NOCLINFO] = "can't contact cluster manager",
185-
[DLM_NOLOCKMGR] = "can't contact lock manager",
186-
[DLM_NOPURGED] = "can't contact purge daemon",
187-
[DLM_BADARGS] = "bad api args",
188-
[DLM_VOID] = "no status",
189-
[DLM_NOTQUEUED] = "NOQUEUE was specified and request failed",
190-
[DLM_IVBUFLEN] = "invalid resource name length",
191-
[DLM_CVTUNGRANT] = "attempted to convert ungranted lock",
192-
[DLM_BADPARAM] = "invalid lock mode specified",
193-
[DLM_VALNOTVALID] = "value block has been invalidated",
194-
[DLM_REJECTED] = "request rejected, unrecognized client",
195-
[DLM_ABORT] = "blocked lock request cancelled",
196-
[DLM_CANCEL] = "conversion request cancelled",
197-
[DLM_IVRESHANDLE] = "invalid resource handle",
198-
[DLM_DEADLOCK] = "deadlock recovery refused this request",
199-
[DLM_DENIED_NOASTS] = "failed to allocate AST",
200-
[DLM_FORWARD] = "request must wait for primary's response",
201-
[DLM_TIMEOUT] = "timeout value for lock has expired",
202-
[DLM_IVGROUPID] = "invalid group specification",
203-
[DLM_VERS_CONFLICT] = "version conflicts prevent request handling",
204-
[DLM_BAD_DEVICE_PATH] = "Locks device does not exist or path wrong",
205-
[DLM_NO_DEVICE_PERMISSION] = "Client has insufficient perms for device",
206-
[DLM_NO_CONTROL_DEVICE] = "Cannot set options on opened device ",
207-
[DLM_RECOVERING] = "lock resource being recovered",
208-
[DLM_MIGRATING] = "lock resource being migrated",
209-
[DLM_MAXSTATS] = "invalid error number",
210-
};
211-
212-
const char *dlm_errmsg(enum dlm_status err)
213-
{
214-
if (err >= DLM_MAXSTATS || err < 0)
215-
return dlm_errmsgs[DLM_MAXSTATS];
216-
return dlm_errmsgs[err];
217-
}
218-
EXPORT_SYMBOL_GPL(dlm_errmsg);
219-
220167
const char *dlm_errname(enum dlm_status err)
221168
{
222169
if (err >= DLM_MAXSTATS || err < 0)

0 commit comments

Comments
 (0)