From 3a5d0f0ce6c90c62edf52a11c1363ac823f8bdd8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:57:17 -0800 Subject: [PATCH] [PATCH] kNFSd: Move SVCFH_fmt from being 'inline' to being 'extern'. This way, the "static char buf" is defined only once instead of once per file. --- fs/nfsd/nfsfh.c | 18 ++++++++++++++++++ include/linux/nfsd/nfsfh.h | 17 ++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index cd73e8d3ab724..31c19821dda88 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -489,3 +489,21 @@ fh_put(struct svc_fh *fhp) return; } +/* + * Shorthand for dprintk()'s + */ +char * SVCFH_fmt(struct svc_fh *fhp) +{ + struct knfsd_fh *fh = &fhp->fh_handle; + + static char buf[80]; + sprintf(buf, "%d: %08x %08x %08x %08x %08x %08x", + fh->fh_size, + fh->fh_base.fh_pad[0], + fh->fh_base.fh_pad[1], + fh->fh_base.fh_pad[2], + fh->fh_base.fh_pad[3], + fh->fh_base.fh_pad[4], + fh->fh_base.fh_pad[5]); + return buf; +} diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 555793d69ddc3..7a0ff0c14337d 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h @@ -186,21 +186,8 @@ static inline void mk_fsid_v2(u32 *fsidv, dev_t dev, ino_t ino) /* * Shorthand for dprintk()'s */ -inline static char * SVCFH_fmt(struct svc_fh *fhp) -{ - struct knfsd_fh *fh = &fhp->fh_handle; - - static char buf[80]; - sprintf(buf, "%d: %08x %08x %08x %08x %08x %08x", - fh->fh_size, - fh->fh_base.fh_pad[0], - fh->fh_base.fh_pad[1], - fh->fh_base.fh_pad[2], - fh->fh_base.fh_pad[3], - fh->fh_base.fh_pad[4], - fh->fh_base.fh_pad[5]); - return buf; -} +extern char * SVCFH_fmt(struct svc_fh *fhp); + /* * Function prototypes */ -- 2.53.0