diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /fs/nfsd/export.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'fs/nfsd/export.c')
| -rw-r--r-- | fs/nfsd/export.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 221483587..1a0267abe 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -145,7 +145,7 @@ exp_export(struct nfsctl_export *nxp) !exp_verify_string(nxp->ex_client, NFSCLNT_IDMAX)) return -EINVAL; - dprintk("exp_export called for %s:%s (%x/%d fl %x).\n", + dprintk("exp_export called for %s:%s (%x/%ld fl %x).\n", nxp->ex_client, nxp->ex_path, nxp->ex_dev, nxp->ex_ino, nxp->ex_flags); dev = nxp->ex_dev; @@ -248,7 +248,7 @@ exp_export(struct nfsctl_export *nxp) finish: /* Release dentry */ - if (err < 0 && dentry) + if (err < 0 && !IS_ERR(dentry)) dput(dentry); /* Unlock hashtable */ @@ -360,7 +360,7 @@ exp_rootfh(struct svc_client *clp, dev_t dev, ino_t ino, struct knfs_fh *f) struct dentry *dentry; struct inode *inode; - dprintk("nfsd: exp_rootfh(%s:%x/%d)\n", clp->cl_ident, dev, ino); + dprintk("nfsd: exp_rootfh(%s:%x/%ld)\n", clp->cl_ident, dev, ino); if (!(exp = exp_get(clp, dev, ino))) return -EPERM; @@ -373,7 +373,7 @@ exp_rootfh(struct svc_client *clp, dev_t dev, ino_t ino, struct knfs_fh *f) } if(inode->i_dev != dev || inode->i_ino != ino) { printk("exp_rootfh: Aieee, ino/dev mismatch\n"); - printk("exp_rootfh: arg[dev(%x):ino(%d)] inode[dev(%x):ino(%ld)]\n", + printk("exp_rootfh: arg[dev(%x):ino(%ld)] inode[dev(%x):ino(%ld)]\n", dev, ino, inode->i_dev, inode->i_ino); } |