|
@@ -484,7 +484,7 @@ static int ceph_tcp_connect(struct ceph_connection *con)
|
|
|
IPPROTO_TCP, &sock);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
- sock->sk->sk_allocation = GFP_NOFS | __GFP_MEMALLOC;
|
|
|
+ sock->sk->sk_allocation = GFP_NOFS;
|
|
|
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
lockdep_set_class(&sock->sk->sk_lock, &socket_class);
|
|
@@ -520,8 +520,6 @@ static int ceph_tcp_connect(struct ceph_connection *con)
|
|
|
ret);
|
|
|
}
|
|
|
|
|
|
- sk_set_memalloc(sock->sk);
|
|
|
-
|
|
|
con->sock = sock;
|
|
|
return 0;
|
|
|
}
|
|
@@ -2808,11 +2806,8 @@ static void con_work(struct work_struct *work)
|
|
|
{
|
|
|
struct ceph_connection *con = container_of(work, struct ceph_connection,
|
|
|
work.work);
|
|
|
- unsigned long pflags = current->flags;
|
|
|
bool fault;
|
|
|
|
|
|
- current->flags |= PF_MEMALLOC;
|
|
|
-
|
|
|
mutex_lock(&con->mutex);
|
|
|
while (true) {
|
|
|
int ret;
|
|
@@ -2866,8 +2861,6 @@ static void con_work(struct work_struct *work)
|
|
|
con_fault_finish(con);
|
|
|
|
|
|
con->ops->put(con);
|
|
|
-
|
|
|
- tsk_restore_flags(current, pflags, PF_MEMALLOC);
|
|
|
}
|
|
|
|
|
|
/*
|