Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph revert from Sage Weil:
"This corrects a recent misadventure with __GFP_MEMALLOC and
PF_MEMALLOC; it turns out it's not a good fit for RBD and we're better
off relying on dirty page throttling"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
Revert "libceph: use memalloc flags for net IO"
+1
-8
+1
-8
net/ceph/messenger.c
+1
-8
net/ceph/messenger.c
···
484
484
IPPROTO_TCP, &sock);
485
485
if (ret)
486
486
return ret;
487
-
sock->sk->sk_allocation = GFP_NOFS | __GFP_MEMALLOC;
487
+
sock->sk->sk_allocation = GFP_NOFS;
488
488
489
489
#ifdef CONFIG_LOCKDEP
490
490
lockdep_set_class(&sock->sk->sk_lock, &socket_class);
···
519
519
pr_err("kernel_setsockopt(TCP_NODELAY) failed: %d",
520
520
ret);
521
521
}
522
-
523
-
sk_set_memalloc(sock->sk);
524
522
525
523
con->sock = sock;
526
524
return 0;
···
2806
2808
{
2807
2809
struct ceph_connection *con = container_of(work, struct ceph_connection,
2808
2810
work.work);
2809
-
unsigned long pflags = current->flags;
2810
2811
bool fault;
2811
-
2812
-
current->flags |= PF_MEMALLOC;
2813
2812
2814
2813
mutex_lock(&con->mutex);
2815
2814
while (true) {
···
2861
2866
con_fault_finish(con);
2862
2867
2863
2868
con->ops->put(con);
2864
-
2865
-
tsk_restore_flags(current, pflags, PF_MEMALLOC);
2866
2869
}
2867
2870
2868
2871
/*