git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
nfsd
/
nfsfh.c
diff --git
a/fs/nfsd/nfsfh.c
b/fs/nfsd/nfsfh.c
index
0cf1061
..
3f2ec2e
100644
(file)
--- a/
fs/nfsd/nfsfh.c
+++ b/
fs/nfsd/nfsfh.c
@@
-41,7
+41,7
@@
extern struct export_operations export_op_default;
* if not, require that we can walk up to exp->ex_dentry
* doing some checks on the 'x' bits
*/
* if not, require that we can walk up to exp->ex_dentry
* doing some checks on the 'x' bits
*/
-int nfsd_acceptable(void *expv, struct dentry *dentry)
+
static
int nfsd_acceptable(void *expv, struct dentry *dentry)
{
struct svc_export *exp = expv;
int rv;
{
struct svc_export *exp = expv;
int rv;
@@
-280,8
+280,8
@@
out:
* an inode. In this case a call to fh_update should be made
* before the fh goes out on the wire ...
*/
* an inode. In this case a call to fh_update should be made
* before the fh goes out on the wire ...
*/
-inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
- __u32 *datap, int *maxsize)
+
static
inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
+
__u32 *datap, int *maxsize)
{
struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op;
{
struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op;
@@
-297,8
+297,9
@@
inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
/*
* for composing old style file handles
*/
/*
* for composing old style file handles
*/
-inline void _fh_update_old(struct dentry *dentry, struct svc_export *exp,
- struct knfsd_fh *fh)
+static inline void _fh_update_old(struct dentry *dentry,
+ struct svc_export *exp,
+ struct knfsd_fh *fh)
{
fh->ofh_ino = ino_t_to_u32(dentry->d_inode->i_ino);
fh->ofh_generation = dentry->d_inode->i_generation;
{
fh->ofh_ino = ino_t_to_u32(dentry->d_inode->i_ino);
fh->ofh_generation = dentry->d_inode->i_generation;
@@
-505,7
+506,7
@@
fh_put(struct svc_fh *fhp)
nfsd_nr_put++;
}
if (exp) {
nfsd_nr_put++;
}
if (exp) {
-
svc_export
_put(&exp->h, &svc_export_cache);
+
cache
_put(&exp->h, &svc_export_cache);
fhp->fh_export = NULL;
}
return;
fhp->fh_export = NULL;
}
return;