3.4-stable patches

added patches:
	mm-hugetlb.c-add-cond_resched_lock-in-return_unused_surplus_pages.patch

diff --git a/queue-3.4/don-t-bother-with-get-put-_write_access-on-non-regular-files.patch b/queue-3.4/don-t-bother-with-get-put-_write_access-on-non-regular-files.patch
deleted file mode 100644 (file)
index 74ece02..0000000
--- a/queue-3.4/don-t-bother-with-get-put-_write_access-on-non-regular-files.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From dd20908a8a06b22c171f6c3fcdbdbd65bed07505 Mon Sep 17 00:00:00 2001
-From: Al Viro <viro@zeniv.linux.org.uk>
-Date: Fri, 14 Mar 2014 10:56:20 -0400
-Subject: don't bother with {get,put}_write_access() on non-regular files
-
-From: Al Viro <viro@zeniv.linux.org.uk>
-
-commit dd20908a8a06b22c171f6c3fcdbdbd65bed07505 upstream.
-
-it's pointless and actually leads to wrong behaviour in at least one
-moderately convoluted case (pipe(), close one end, try to get to
-another via /proc/*/fd and run into ETXTBUSY).
-
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/fs/file_table.c b/fs/file_table.c
-index 5b24008ea4f6..79ecae62209a 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -209,10 +209,10 @@ static void drop_file_write_access(struct file *file)
-       struct dentry *dentry = file->f_path.dentry;
-       struct inode *inode = dentry->d_inode;
- 
--      put_write_access(inode);
--
-       if (special_file(inode->i_mode))
-               return;
-+
-+      put_write_access(inode);
-       if (file_check_writeable(file) != 0)
-               return;
-       __mnt_drop_write(mnt);
-diff --git a/fs/open.c b/fs/open.c
-index b9ed8b25c108..2ed7325f713e 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -641,23 +641,12 @@ out:
- static inline int __get_file_write_access(struct inode *inode,
-                                         struct vfsmount *mnt)
- {
--      int error;
--      error = get_write_access(inode);
-+      int error = get_write_access(inode);
-       if (error)
-               return error;
--      /*
--       * Do not take mount writer counts on
--       * special files since no writes to
--       * the mount itself will occur.
--       */
--      if (!special_file(inode->i_mode)) {
--              /*
--               * Balanced in __fput()
--               */
--              error = __mnt_want_write(mnt);
--              if (error)
--                      put_write_access(inode);
--      }
-+      error = __mnt_want_write(mnt);
-+      if (error)
-+              put_write_access(inode);
-       return error;
- }
- 
-@@ -690,12 +679,11 @@ static int do_dentry_open(struct file *f,
- 
-       path_get(&f->f_path);
-       inode = f->f_inode = f->f_path.dentry->d_inode;
--      if (f->f_mode & FMODE_WRITE) {
-+      if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) {
-               error = __get_file_write_access(inode, f->f_path.mnt);
-               if (error)
-                       goto cleanup_file;
--              if (!special_file(inode->i_mode))
--                      file_take_write(f);
-+              file_take_write(f);
-       }
- 
-       f->f_mapping = inode->i_mapping;
-@@ -742,7 +730,6 @@ static int do_dentry_open(struct file *f,
- cleanup_all:
-       fops_put(f->f_op);
-       if (f->f_mode & FMODE_WRITE) {
--              put_write_access(inode);
-               if (!special_file(inode->i_mode)) {
-                       /*
-                        * We don't consider this a real
-@@ -750,6 +737,7 @@ cleanup_all:
-                        * because it all happenend right
-                        * here, so just reset the state.
-                        */
-+                      put_write_access(inode);
-                       file_reset_write(f);
-                       __mnt_drop_write(f->f_path.mnt);
-               }

diff --git a/queue-3.4/mm-hugetlb.c-add-cond_resched_lock-in-return_unused_surplus_pages.patch b/queue-3.4/mm-hugetlb.c-add-cond_resched_lock-in-return_unused_surplus_pages.patch
new file mode 100644 (file)
index 0000000..116eb82
--- /dev/null
+++ b/queue-3.4/mm-hugetlb.c-add-cond_resched_lock-in-return_unused_surplus_pages.patch
@@ -0,0 +1,37 @@
+From 7848a4bf51b34f41fcc9bd77e837126d99ae84e3 Mon Sep 17 00:00:00 2001
+From: "Mizuma, Masayoshi" <m.mizuma@jp.fujitsu.com>
+Date: Fri, 18 Apr 2014 15:07:18 -0700
+Subject: mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
+
+From: "Mizuma, Masayoshi" <m.mizuma@jp.fujitsu.com>
+
+commit 7848a4bf51b34f41fcc9bd77e837126d99ae84e3 upstream.
+
+soft lockup in freeing gigantic hugepage fixed in commit 55f67141a892 "mm:
+hugetlb: fix softlockup when a large number of hugepages are freed." can
+happen in return_unused_surplus_pages(), so let's fix it.
+
+Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
+Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
+Cc: Michal Hocko <mhocko@suse.cz>
+Cc: Aneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
+Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/hugetlb.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -1082,6 +1082,7 @@ static void return_unused_surplus_pages(
+       while (nr_pages--) {
+               if (!free_pool_huge_page(h, &node_states[N_HIGH_MEMORY], 1))
+                       break;
++              cond_resched_lock(&hugetlb_lock);
+       }
+ }
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index eecc345db6b3bc55284d2e3831b86513a06490ca..58ec7b16a5f9b845417b2068fb3c436dd0a607dc 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -1,2 +1,2 @@
 parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch
-don-t-bother-with-get-put-_write_access-on-non-regular-files.patch
+mm-hugetlb.c-add-cond_resched_lock-in-return_unused_surplus_pages.patch