hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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"
This commit is contained in:
Linus Torvalds 2015-04-08 14:51:56 -07:00
parent b97fdef8e6 6d7fdb0ab3
commit 9a08da1c8b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ceph/messenger.c
View File

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