Merge branch 'akpm' (Andrew's patch-bomb)

Merge Andrew's second set of patches:
 - MM
 - a few random fixes
 - a couple of RTC leftovers

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
  rtc/rtc-88pm80x: remove unneed devm_kfree
  rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails
  mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
  tmpfs: distribute interleave better across nodes
  mm: remove redundant initialization
  mm: warn if pg_data_t isn't initialized with zero
  mips: zero out pg_data_t when it's allocated
  memcg: gix memory accounting scalability in shrink_page_list
  mm/sparse: remove index_init_lock
  mm/sparse: more checks on mem_section number
  mm/sparse: optimize sparse_index_alloc
  memcg: add mem_cgroup_from_css() helper
  memcg: further prevent OOM with too many dirty pages
  memcg: prevent OOM with too many dirty pages
  mm: mmu_notifier: fix freed page still mapped in secondary MMU
  mm: memcg: only check anon swapin page charges for swap cache
  mm: memcg: only check swap cache pages for repeated charging
  mm: memcg: split swapin charge function into private and public part
  mm: memcg: remove needless !mm fixup to init_mm when charging
  mm: memcg: remove unneeded shmem charge type
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 061427a75d37..76bc96fd01c8 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -154,6 +154,7 @@ static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,
         struct msghdr msg;
         struct kvec iov;
         sigset_t blocked, oldset;
+        unsigned long pflags = current->flags;
 
         if (unlikely(!sock)) {
                 dev_err(disk_to_dev(nbd->disk),
@@ -167,8 +168,9 @@ static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,
         siginitsetinv(&blocked, sigmask(SIGKILL));
         sigprocmask(SIG_SETMASK, &blocked, &oldset);
 
+        current->flags |= PF_MEMALLOC;
         do {
-                sock->sk->sk_allocation = GFP_NOIO;
+                sock->sk->sk_allocation = GFP_NOIO | __GFP_MEMALLOC;
                 iov.iov_base = buf;
                 iov.iov_len = size;
                 msg.msg_name = NULL;
@@ -214,6 +216,7 @@ static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,
         } while (size > 0);
 
         sigprocmask(SIG_SETMASK, &oldset, NULL);
+        tsk_restore_flags(current, pflags, PF_MEMALLOC);
 
         return result;
 }
@@ -405,6 +408,7 @@ static int nbd_do_it(struct nbd_device *nbd)
 
         BUG_ON(nbd->magic != NBD_MAGIC);
 
+        sk_set_memalloc(nbd->sock->sk);
         nbd->pid = task_pid_nr(current);
         ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
         if (ret) {