Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6.git] / net / sunrpc / xprtsock.c

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 0b84fab68d7e971168254058bbeb4d45a06698c2..9b62923a9c0689fd75569fb494e66604f06ce4e7 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -215,7 +215,6 @@ static inline int xs_sendpages(struct socket *sock, struct sockaddr *addr, int a
        struct page **ppage = xdr->pages;
        unsigned int len, pglen = xdr->page_len;
        int err, ret = 0;
        struct page **ppage = xdr->pages;
        unsigned int len, pglen = xdr->page_len;
        int err, ret = 0;

-       ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int);

 
        if (unlikely(!sock))
                return -ENOTCONN;
 
        if (unlikely(!sock))
                return -ENOTCONN;


@@ -248,7 +247,6 @@ static inline int xs_sendpages(struct socket *sock, struct sockaddr *addr, int a
                base &= ~PAGE_CACHE_MASK;
        }
 
                base &= ~PAGE_CACHE_MASK;
        }
 

-       sendpage = sock->ops->sendpage ? : sock_no_sendpage;

        do {
                int flags = XS_SENDMSG_FLAGS;
 
        do {
                int flags = XS_SENDMSG_FLAGS;
 


@@ -261,10 +259,7 @@ static inline int xs_sendpages(struct socket *sock, struct sockaddr *addr, int a
                if (pglen != len || xdr->tail[0].iov_len != 0)
                        flags |= MSG_MORE;
 
                if (pglen != len || xdr->tail[0].iov_len != 0)
                        flags |= MSG_MORE;
 

-               /* Hmm... We might be dealing with highmem pages */
-               if (PageHighMem(*ppage))
-                       sendpage = sock_no_sendpage;
-               err = sendpage(sock, *ppage, base, len, flags);
+               err = kernel_sendpage(sock, *ppage, base, len, flags);

                if (ret == 0)
                        ret = err;
                else if (err > 0)
                if (ret == 0)
                        ret = err;
                else if (err > 0)


@@ -1044,7 +1039,7 @@ static int xs_bindresvport(struct rpc_xprt *xprt, struct socket *sock)
 
        do {
                myaddr.sin_port = htons(port);
 
        do {
                myaddr.sin_port = htons(port);

-               err = sock->ops->bind(sock, (struct sockaddr *) &myaddr,
+               err = kernel_bind(sock, (struct sockaddr *) &myaddr,

                                                sizeof(myaddr));
                if (err == 0) {
                        xprt->port = port;
                                                sizeof(myaddr));
                if (err == 0) {
                        xprt->port = port;


@@ -1140,7 +1135,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt)
         */
        memset(&any, 0, sizeof(any));
        any.sa_family = AF_UNSPEC;
         */
        memset(&any, 0, sizeof(any));
        any.sa_family = AF_UNSPEC;

-       result = sock->ops->connect(sock, &any, sizeof(any), 0);
+       result = kernel_connect(sock, &any, sizeof(any), 0);

        if (result)
                dprintk("RPC:      AF_UNSPEC connect return code %d\n",
                                result);
        if (result)
                dprintk("RPC:      AF_UNSPEC connect return code %d\n",
                                result);


@@ -1211,7 +1206,7 @@ static void xs_tcp_connect_worker(void *args)
        /* Tell the socket layer to start connecting... */
        xprt->stat.connect_count++;
        xprt->stat.connect_start = jiffies;
        /* Tell the socket layer to start connecting... */
        xprt->stat.connect_count++;
        xprt->stat.connect_start = jiffies;

-       status = sock->ops->connect(sock, (struct sockaddr *) &xprt->addr,
+       status = kernel_connect(sock, (struct sockaddr *) &xprt->addr,

                        xprt->addrlen, O_NONBLOCK);
        dprintk("RPC: %p  connect status %d connected %d sock state %d\n",
                        xprt, -status, xprt_connected(xprt), sock->sk->sk_state);
                        xprt->addrlen, O_NONBLOCK);
        dprintk("RPC: %p  connect status %d connected %d sock state %d\n",
                        xprt, -status, xprt_connected(xprt), sock->sk->sk_state);