]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
kclient: better
authorSage Weil <sage@newdream.net>
Fri, 25 Apr 2008 04:02:28 +0000 (21:02 -0700)
committerSage Weil <sage@newdream.net>
Fri, 25 Apr 2008 04:02:28 +0000 (21:02 -0700)
src/kernel/ktcp.c

index 8b43139c83507cf493c56ccb87fff63c3df084c6..a11103d3c41aa6eede3e5428e71cec9f1db739ab 100644 (file)
@@ -134,7 +134,7 @@ int ceph_tcp_connect(struct ceph_connection *con)
                goto done;
        }
        
-       sk->sk_allocation = GFP_NOFS;
+       con->sock->sk->sk_allocation = GFP_NOFS;
 
        set_sock_callbacks(con->sock, con);
 
@@ -173,7 +173,7 @@ int ceph_tcp_listen(struct ceph_messenger *msgr)
                return ret;
        }
 
-       sk->sk_allocation = GFP_NOFS;
+       sock->sk->sk_allocation = GFP_NOFS;
 
        ret = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                                (char *)&optval, sizeof(optval));
@@ -239,7 +239,7 @@ int ceph_tcp_accept(struct socket *sock, struct ceph_connection *con)
                goto done;
        }
 
-       sk->sk_allocation = GFP_NOFS;
+       con->sock->sk->sk_allocation = GFP_NOFS;
 
        ret = sock->ops->accept(sock, con->sock, O_NONBLOCK);
        /* ret = kernel_accept(sock, &new_sock, sock->file->f_flags); */