Commit 3a5d0f0c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent cb614135
...@@ -489,3 +489,21 @@ fh_put(struct svc_fh *fhp) ...@@ -489,3 +489,21 @@ fh_put(struct svc_fh *fhp)
return; 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;
}
...@@ -186,21 +186,8 @@ static inline void mk_fsid_v2(u32 *fsidv, dev_t dev, ino_t ino) ...@@ -186,21 +186,8 @@ static inline void mk_fsid_v2(u32 *fsidv, dev_t dev, ino_t ino)
/* /*
* Shorthand for dprintk()'s * Shorthand for dprintk()'s
*/ */
inline static char * SVCFH_fmt(struct svc_fh *fhp) extern 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;
}
/* /*
* Function prototypes * Function prototypes
*/ */
......
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