Merge with /home/shaggy/git/linus-clean/

1 files changed, 5 insertions, 1 deletions

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index f2ca782aba33..fcd97406a778 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -14,6 +14,9 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
+
+#include <net/inet_sock.h>
+
 #include "nfs4_fs.h"
 #include "callback.h"
 
@@ -31,6 +34,7 @@ static struct nfs_callback_data nfs_callback_info;
 static DECLARE_MUTEX(nfs_callback_sema);
 static struct svc_program nfs4_callback_program;
 
+unsigned int nfs_callback_set_tcpport;
 unsigned short nfs_callback_tcpport;
 
 /*
@@ -95,7 +99,7 @@ int nfs_callback_up(void)
         if (!serv)
                 goto out_err;
         /* FIXME: We don't want to register this socket with the portmapper */
-        ret = svc_makesock(serv, IPPROTO_TCP, 0);
+        ret = svc_makesock(serv, IPPROTO_TCP, nfs_callback_set_tcpport);
         if (ret < 0)
                 goto out_destroy;
         if (!list_empty(&serv->sv_permsocks)) {