Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/nfs add appropriate #ifdef's.



details:   https://anonhg.NetBSD.org/src/rev/c3ed3d4a3f68
branches:  trunk
changeset: 548403:c3ed3d4a3f68
user:      yamt <yamt%NetBSD.org@localhost>
date:      Thu Jun 26 13:38:53 2003 +0000

description:
add appropriate #ifdef's.
pointed by Simon Burge on source-changes
and by some people in private mail.

diffstat:

 sys/nfs/nfs_syscalls.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r ae61fe7043ab -r c3ed3d4a3f68 sys/nfs/nfs_syscalls.c
--- a/sys/nfs/nfs_syscalls.c    Thu Jun 26 13:20:55 2003 +0000
+++ b/sys/nfs/nfs_syscalls.c    Thu Jun 26 13:38:53 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_syscalls.c,v 1.66 2003/06/25 14:37:50 yamt Exp $   */
+/*     $NetBSD: nfs_syscalls.c,v 1.67 2003/06/26 13:38:53 yamt Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.66 2003/06/25 14:37:50 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.67 2003/06/26 13:38:53 yamt Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfs.h"
@@ -160,13 +160,13 @@
        } */ *uap = v;
        struct proc *p = l->l_proc;
        int error;
-       int s;
 #ifdef NFS
        struct nameidata nd;
        struct nfsmount *nmp;
        struct nfsd_cargs ncd;
 #endif
 #ifdef NFSSERVER
+       int s;
        struct file *fp;
        struct mbuf *nam;
        struct nfsd_args nfsdarg;
@@ -182,6 +182,7 @@
        error = suser(p->p_ucred, &p->p_acflag);
        if(error)
                return (error);
+#ifdef NFSSERVER
        s = splsoftnet();
        simple_lock(&nfsd_slock);
        while (nfssvc_sockhead_flag & SLP_INIT) {
@@ -191,6 +192,7 @@
        }
        simple_unlock(&nfsd_slock);
        splx(s);
+#endif
        if (SCARG(uap, flag) & NFSSVC_BIOD) {
 #if defined(NFS) && defined(COMPAT_14)
                error = nfssvc_iod(l);



Home | Main Index | Thread Index | Old Index