NFSv4.1: Declare osd_pri_2_pnfs_err(), objio_init_read/write to be static

[mirror_ubuntu-artful-kernel.git] / fs / nfs / callback.c

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 6dfdc8311f27a01ee3b8f71d4d50e6c38a4a8886..9a521fb3986955aab3f32e755bdef94e9c313aa2 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -12,6 +12,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
+#include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <linux/kthread.h>
@@ -71,7 +72,7 @@ out_err:
 static int
 nfs4_callback_svc(void *vrqstp)
 {
-       int err, preverr = 0;
+       int err;
        struct svc_rqst *rqstp = vrqstp;
 
        set_freezable();
@@ -81,20 +82,8 @@ nfs4_callback_svc(void *vrqstp)
                 * Listen for a request on the socket
                 */
                err = svc_recv(rqstp, MAX_SCHEDULE_TIMEOUT);
-               if (err == -EAGAIN || err == -EINTR) {
-                       preverr = err;
+               if (err == -EAGAIN || err == -EINTR)
                        continue;
-               }
-               if (err < 0) {
-                       if (err != preverr) {
-                               printk(KERN_WARNING "NFS: %s: unexpected error "
-                                       "from svc_recv (%d)\n", __func__, err);
-                               preverr = err;
-                       }
-                       schedule_timeout_uninterruptible(HZ);
-                       continue;
-               }
-               preverr = err;
                svc_process(rqstp);
        }
        return 0;
@@ -177,15 +166,11 @@ nfs41_callback_up(struct svc_serv *serv)
        return rqstp;
 }
 
-static inline int nfs_minorversion_callback_svc_setup(u32 minorversion,
-               struct svc_serv *serv,
+static void nfs_minorversion_callback_svc_setup(struct svc_serv *serv,
                struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
 {
-       if (minorversion) {
-               *rqstpp = nfs41_callback_up(serv);
-               *callback_svc = nfs41_callback_svc;
-       }
-       return minorversion;
+       *rqstpp = nfs41_callback_up(serv);
+       *callback_svc = nfs41_callback_svc;
 }
 
 static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
@@ -204,11 +189,11 @@ static int nfs41_callback_up_net(struct svc_serv *serv, struct net *net)
        return 0;
 }
 
-static inline int nfs_minorversion_callback_svc_setup(u32 minorversion,
-               struct svc_serv *serv,
+static void nfs_minorversion_callback_svc_setup(struct svc_serv *serv,
                struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
 {
-       return 0;
+       *rqstpp = ERR_PTR(-ENOTSUPP);
+       *callback_svc = ERR_PTR(-ENOTSUPP);
 }
 
 static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
@@ -225,19 +210,21 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
        struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
        char svc_name[12];
        int ret;
-       int minorversion_setup;
 
        nfs_callback_bc_serv(minorversion, xprt, serv);
 
        if (cb_info->task)
                return 0;
 
-       minorversion_setup =  nfs_minorversion_callback_svc_setup(minorversion,
-                                       serv, &rqstp, &callback_svc);
-       if (!minorversion_setup) {
+       switch (minorversion) {
+       case 0:
                /* v4.0 callback setup */
                rqstp = nfs4_callback_up(serv);
                callback_svc = nfs4_callback_svc;
+               break;
+       default:
+               nfs_minorversion_callback_svc_setup(serv,
+                               &rqstp, &callback_svc);
        }
 
        if (IS_ERR(rqstp))
@@ -410,7 +397,9 @@ void nfs_callback_down(int minorversion, struct net *net)
        cb_info->users--;
        if (cb_info->users == 0 && cb_info->task != NULL) {
                kthread_stop(cb_info->task);
+               dprintk("nfs_callback_down: service stopped\n");
                svc_exit_thread(cb_info->rqst);
+               dprintk("nfs_callback_down: service destroyed\n");
                cb_info->serv = NULL;
                cb_info->rqst = NULL;
                cb_info->task = NULL;