[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: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> [ Also made it "const char *" - Linus] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
f2d7499be1
Коммит
f1c7f79b6a
|
@ -851,7 +851,7 @@ struct nfsd4_operation {
|
|||
|
||||
static struct nfsd4_operation nfsd4_ops[];
|
||||
|
||||
static inline char *nfsd4_op_name(unsigned opnum);
|
||||
static const char *nfsd4_op_name(unsigned opnum);
|
||||
|
||||
/*
|
||||
* COMPOUND call.
|
||||
|
@ -1116,8 +1116,7 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
|
|||
},
|
||||
};
|
||||
|
||||
static inline char *
|
||||
nfsd4_op_name(unsigned opnum)
|
||||
static const char *nfsd4_op_name(unsigned opnum)
|
||||
{
|
||||
if (opnum < ARRAY_SIZE(nfsd4_ops))
|
||||
return nfsd4_ops[opnum].op_name;
|
||||
|
|
Загрузка…
Ссылка в новой задаче