[2.6 patch] uninline nfsd4_op_name()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Adrian Bunk
Date: Friday, August 8, 2008 - 9:26 am

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:

<--  snip  -->

...
  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

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -851,7 +851,7 @@ struct nfsd4_operation {
 
 static struct nfsd4_operation nfsd4_ops[];
 
-static inline char *nfsd4_op_name(unsigned opnum);
+static 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 char *nfsd4_op_name(unsigned opnum)
 {
 	if (opnum < ARRAY_SIZE(nfsd4_ops))
 		return nfsd4_ops[opnum].op_name;

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[2.6 patch] uninline nfsd4_op_name(), Adrian Bunk, (Fri Aug 8, 9:26 am)
Re: [2.6 patch] uninline nfsd4_op_name(), Linus Torvalds, (Fri Aug 8, 11:25 am)
Re: [2.6 patch] uninline nfsd4_op_name(), Benny Halevy, (Sun Aug 10, 4:32 am)
Re: [2.6 patch] uninline nfsd4_op_name(), J. Bruce Fields, (Sun Aug 10, 8:03 pm)
Re: [2.6 patch] uninline nfsd4_op_name(), Benny Halevy, (Mon Aug 11, 1:47 am)
Re: [2.6 patch] uninline nfsd4_op_name(), J. Bruce Fields, (Mon Aug 11, 8:39 am)