Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 2 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index bb53285a1d99..3a7587a0314d 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -415,6 +415,7 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
                 struct shrink_control *sc, unsigned long nr_to_split)
 {
         LIST_HEAD(list), *pos, *next;
+        LIST_HEAD(to_remove);
         struct inode *inode;
         struct shmem_inode_info *info;
         struct page *page;
@@ -441,9 +442,8 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
                 /* Check if there's anything to gain */
                 if (round_up(inode->i_size, PAGE_SIZE) ==
                                 round_up(inode->i_size, HPAGE_PMD_SIZE)) {
-                        list_del_init(&info->shrinklist);
+                        list_move(&info->shrinklist, &to_remove);
                         removed++;
-                        iput(inode);
                         goto next;
                 }
 
@@ -454,6 +454,13 @@ next:
         }
         spin_unlock(&sbinfo->shrinklist_lock);
 
+        list_for_each_safe(pos, next, &to_remove) {
+                info = list_entry(pos, struct shmem_inode_info, shrinklist);
+                inode = &info->vfs_inode;
+                list_del_init(&info->shrinklist);
+                iput(inode);
+        }
+
         list_for_each_safe(pos, next, &list) {
                 int ret;