Commit f1c7f79b authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[NFSD] uninline nfsd4_op_name()

There doesn't seem to be a compelling reason why nfsd4_op_name() is
marked as "inline":

It's only used in a dprintk(), and as long as it has only one caller
non-ancient gcc versions anyway inline it automatically.

This patch fixes the following compile error with gcc 3.4:

  ...
    CC      fs/nfsd/nfs4proc.o
  nfs4proc.c: In function `nfsd4_proc_compound':
  nfs4proc.c:854: sorry, unimplemented: inlining failed in call to
  nfs4proc.c:897: sorry, unimplemented: called from here
  make[3]: *** [fs/nfsd/nfs4proc.o] Error 1
Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
[ Also made it "const char *"  - Linus]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2d7499b
...@@ -851,7 +851,7 @@ struct nfsd4_operation { ...@@ -851,7 +851,7 @@ struct nfsd4_operation {
static struct nfsd4_operation nfsd4_ops[]; static struct nfsd4_operation nfsd4_ops[];
static inline char *nfsd4_op_name(unsigned opnum); static const char *nfsd4_op_name(unsigned opnum);
/* /*
* COMPOUND call. * COMPOUND call.
...@@ -1116,8 +1116,7 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = { ...@@ -1116,8 +1116,7 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
}, },
}; };
static inline char * static const char *nfsd4_op_name(unsigned opnum)
nfsd4_op_name(unsigned opnum)
{ {
if (opnum < ARRAY_SIZE(nfsd4_ops)) if (opnum < ARRAY_SIZE(nfsd4_ops))
return nfsd4_ops[opnum].op_name; return nfsd4_ops[opnum].op_name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment