patch to make nfsd compile cleanly (2.1.47)

Darren Reed (darrenr@cyber.com.au)
Fri, 25 Jul 1997 12:02:41 +1000 (EST)


this just cleans up warnings and removes the syscall problem...

*** include/linux/nfsd/syscall.h.dist Fri Jul 25 11:45:02 1997
--- include/linux/nfsd/syscall.h Fri Jul 25 11:55:05 1997
***************
*** 112,119 ****
* Kernel syscall implementation.
*/
#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)
! extern asmlinkage int sys_nfsservctl(int, struct nfsctl_arg *,
! union nfsctl_res *);
#else
#define sys_nfsservctl sys_ni_syscall
#endif
--- 112,118 ----
* Kernel syscall implementation.
*/
#if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)
! extern asmlinkage int sys_nfsservctl(int, void *, void *);
#else
#define sys_nfsservctl sys_ni_syscall
#endif

*** fs/nfsd/export.c.dist Fri Jul 25 11:56:35 1997
--- fs/nfsd/export.c Fri Jul 25 11:58:43 1997
***************
*** 145,151 ****
!exp_verify_string(nxp->ex_client, NFSCLNT_IDMAX))
return -EINVAL;

! dprintk("exp_export called for %s:%s (%x/%d fl %x).\n",
nxp->ex_client, nxp->ex_path,
nxp->ex_dev, nxp->ex_ino, nxp->ex_flags);
dev = nxp->ex_dev;
--- 145,151 ----
!exp_verify_string(nxp->ex_client, NFSCLNT_IDMAX))
return -EINVAL;

! 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;
***************
*** 360,366 ****
struct dentry *dentry;
struct inode *inode;

! dprintk("nfsd: exp_rootfh(%s:%x/%d)\n", clp->cl_ident, dev, ino);

if (!(exp = exp_get(clp, dev, ino)))
return -EPERM;
--- 360,366 ----
struct dentry *dentry;
struct inode *inode;

! dprintk("nfsd: exp_rootfh(%s:%x/%ld)\n", clp->cl_ident, dev, ino);

if (!(exp = exp_get(clp, dev, ino)))
return -EPERM;
***************
*** 373,379 ****
}
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",
dev, ino, inode->i_dev, inode->i_ino);
}

--- 373,379 ----
}
if(inode->i_dev != dev || inode->i_ino != ino) {
printk("exp_rootfh: Aieee, ino/dev mismatch\n");
! printk("exp_rootfh: arg[dev(%x):ino(%ld)] inode[dev(%x):ino(%ld)]\n",
dev, ino, inode->i_dev, inode->i_ino);
}