Merge branch 'linus' into sched/core

Conflicts:
	fs/proc/array.c

Merge reason: resolve conflict and queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 19 insertions, 10 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index e350bd6a2334..99ea196f071f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -648,8 +648,6 @@ static int nfs_start_lockd(struct nfs_server *server)
                 .hostname       = clp->cl_hostname,
                 .address        = (struct sockaddr *)&clp->cl_addr,
                 .addrlen        = clp->cl_addrlen,
-                .protocol       = server->flags & NFS_MOUNT_TCP ?
-                                                IPPROTO_TCP : IPPROTO_UDP,
                 .nfs_version    = clp->rpc_ops->version,
                 .noresvport     = server->flags & NFS_MOUNT_NORESVPORT ?
                                         1 : 0,
@@ -660,6 +658,14 @@ static int nfs_start_lockd(struct nfs_server *server)
         if (server->flags & NFS_MOUNT_NONLM)
                 return 0;
 
+        switch (clp->cl_proto) {
+                default:
+                        nlm_init.protocol = IPPROTO_TCP;
+                        break;
+                case XPRT_TRANSPORT_UDP:
+                        nlm_init.protocol = IPPROTO_UDP;
+        }
+
         host = nlmclnt_init(&nlm_init);
         if (IS_ERR(host))
                 return PTR_ERR(host);
@@ -787,7 +793,7 @@ static int nfs_init_server(struct nfs_server *server,
         dprintk("--> nfs_init_server()\n");
 
 #ifdef CONFIG_NFS_V3
-        if (data->flags & NFS_MOUNT_VER3)
+        if (data->version == 3)
                 cl_init.rpc_ops = &nfs_v3_clientops;
 #endif
 
@@ -933,10 +939,6 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
                 goto out_error;
 
         nfs_server_set_fsinfo(server, &fsinfo);
-        error = bdi_init(&server->backing_dev_info);
-        if (error)
-                goto out_error;
-
 
         /* Get some general file system info */
         if (server->namelen == 0) {
@@ -968,6 +970,7 @@ static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_serve
         target->acdirmin = source->acdirmin;
         target->acdirmax = source->acdirmax;
         target->caps = source->caps;
+        target->options = source->options;
 }
 
 /*
@@ -995,6 +998,12 @@ static struct nfs_server *nfs_alloc_server(void)
                 return NULL;
         }
 
+        if (bdi_init(&server->backing_dev_info)) {
+                nfs_free_iostats(server->io_stats);
+                kfree(server);
+                return NULL;
+        }
+
         return server;
 }
 
@@ -1171,7 +1180,7 @@ static int nfs4_init_client(struct nfs_client *clp,
                                       1, flags & NFS_MOUNT_NORESVPORT);
         if (error < 0)
                 goto error;
-        memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
+        strlcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
 
         error = nfs_idmap_new(clp);
         if (error < 0) {
@@ -1529,7 +1538,7 @@ static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_server_list_stop(struct seq_file *p, void *v);
 static int nfs_server_list_show(struct seq_file *m, void *v);
 
-static struct seq_operations nfs_server_list_ops = {
+static const struct seq_operations nfs_server_list_ops = {
         .start  = nfs_server_list_start,
         .next   = nfs_server_list_next,
         .stop   = nfs_server_list_stop,
@@ -1550,7 +1559,7 @@ static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_volume_list_stop(struct seq_file *p, void *v);
 static int nfs_volume_list_show(struct seq_file *m, void *v);
 
-static struct seq_operations nfs_volume_list_ops = {
+static const struct seq_operations nfs_volume_list_ops = {
         .start  = nfs_volume_list_start,
         .next   = nfs_volume_list_next,
         .stop   = nfs_volume_list_stop,