This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / nfsd / nfssvc.c

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 453dbec..02ded7c 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -30,7 +30,6 @@
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/stats.h>
 #include <linux/nfsd/cache.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/lockd/bind.h>
 
 #define NFSDDBG_FACILITY       NFSDDBG_SVC
@@ -52,7 +51,10 @@
 extern struct svc_program      nfsd_program;
 static void                    nfsd(struct svc_rqst *rqstp);
 struct timeval                 nfssvc_boot;
-static struct svc_serv                 *nfsd_serv; static atomic_t                     nfsd_busy; static unsigned long         nfsd_last_call; static DEFINE_SPINLOCK(nfsd_call_lock);
+static struct svc_serv                 *nfsd_serv;
+static atomic_t                        nfsd_busy;
+static unsigned long           nfsd_last_call;
+static DEFINE_SPINLOCK(nfsd_call_lock);
 
 struct nfsd_list {
        struct list_head        list;
@@ -60,31 +62,6 @@ struct nfsd_list {
 };
 static struct list_head nfsd_list = LIST_HEAD_INIT(nfsd_list);
 
-extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;
-
-static struct svc_version *    nfsd_version[] = {
-       [2] = &nfsd_version2,
-#if defined(CONFIG_NFSD_V3)
-       [3] = &nfsd_version3,
-#endif
-#if defined(CONFIG_NFSD_V4)
-       [4] = &nfsd_version4,
-#endif
-};
-
-#define NFSD_MINVERS           2
-#define NFSD_NRVERS            (sizeof(nfsd_version)/sizeof(nfsd_version[0]))
-struct svc_program             nfsd_program = {
-       .pg_prog                = NFS_PROGRAM,          /* program number */
-       .pg_nvers               = NFSD_NRVERS,          /* nr of entries in nfsd_version */
-       .pg_vers                = nfsd_version,         /* version table */
-       .pg_name                = "nfsd",               /* program name */
-       .pg_class               = "nfsd",               /* authentication class */
-       .pg_stats               = &nfsd_svcstats,       /* version table */
-       .pg_authenticate        = &svc_set_client,      /* export authentication */
-
-};
-
 /*
  * Maximum number of nfsd processes
  */
@@ -102,37 +79,17 @@ int
 nfsd_svc(unsigned short port, int nrservs)
 {
        int     error;
-       int     none_left, found_one, i;
+       int     none_left;      
        struct list_head *victim;
        
        lock_kernel();
-       dprintk("nfsd: creating service: port %d vers 0x%x proto 0x%x\n",
-               nfsd_port, nfsd_versbits, nfsd_portbits);
+       dprintk("nfsd: creating service\n");
        error = -EINVAL;
        if (nrservs <= 0)
                nrservs = 0;
        if (nrservs > NFSD_MAXSERVS)
                nrservs = NFSD_MAXSERVS;
        
-       /*
-        * If set, use the nfsd_ctlbits to define which
-        * versions that will be advertised
-        */
-       found_one = 0;
-       if (nfsd_versbits) {
-               for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) {
-                       if (NFSCTL_VERISSET(nfsd_versbits, i)) {
-                               nfsd_program.pg_vers[i] = nfsd_version[i];
-                               found_one = 1;
-                       } else
-                               nfsd_program.pg_vers[i] = NULL;
-               }
-       }
-       if (!found_one) {
-               for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++)
-                       nfsd_program.pg_vers[i] = nfsd_version[i];
-       }
-
        /* Readahead param cache - will no-op if it already exists */
        error = nfsd_racache_init(2*nrservs);
        if (error<0)
@@ -140,24 +97,20 @@ nfsd_svc(unsigned short port, int nrservs)
        error = nfs4_state_init();
        if (error<0)
                goto out;
-
        if (!nfsd_serv) {
                atomic_set(&nfsd_busy, 0);
                error = -ENOMEM;
                nfsd_serv = svc_create(&nfsd_program, NFSD_BUFSIZE);
                if (nfsd_serv == NULL)
                        goto out;
-               if (!nfsd_portbits || NFSCTL_UDPISSET(nfsd_portbits)) {
-                       error = svc_makesock(nfsd_serv, IPPROTO_UDP, nfsd_port);
-                       if (error < 0)
-                               goto failure;
-               }
+               error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
+               if (error < 0)
+                       goto failure;
+
 #ifdef CONFIG_NFSD_TCP
-               if (!nfsd_portbits || NFSCTL_TCPISSET(nfsd_portbits)) {
-                   error = svc_makesock(nfsd_serv, IPPROTO_TCP, nfsd_port);
-                   if (error < 0)
-                           goto failure;
-               }
+               error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
+               if (error < 0)
+                       goto failure;
 #endif
                do_gettimeofday(&nfssvc_boot);          /* record boot time */
        } else
@@ -409,3 +362,26 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp)
        return 1;
 }
 
+extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;
+
+static struct svc_version *    nfsd_version[] = {
+       [2] = &nfsd_version2,
+#if defined(CONFIG_NFSD_V3)
+       [3] = &nfsd_version3,
+#endif
+#if defined(CONFIG_NFSD_V4)
+       [4] = &nfsd_version4,
+#endif
+};
+
+#define NFSD_NRVERS            (sizeof(nfsd_version)/sizeof(nfsd_version[0]))
+struct svc_program             nfsd_program = {
+       .pg_prog                = NFS_PROGRAM,          /* program number */
+       .pg_nvers               = NFSD_NRVERS,          /* nr of entries in nfsd_version */
+       .pg_vers                = nfsd_version,         /* version table */
+       .pg_name                = "nfsd",               /* program name */
+       .pg_class               = "nfsd",               /* authentication class */
+       .pg_stats               = &nfsd_svcstats,       /* version table */
+       .pg_authenticate        = &svc_set_client,      /* export authentication */
+
+};