[PATCH] tmpfs blk_congestion_wait fix

From: Hugh Dickins <hugh@veritas.com>

The blk_congestion_waits in shmem_getpage are appropriate when the error is
-ENOMEM, but not when the error is -EEXIST.  So add that test in the first
instance, but omit it all in the second instance.

mm/shmem.c

@@ -839,7 +839,8 @@ static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **p
 			SetPageUptodate(filepage);
 			set_page_dirty(filepage);
 			swap_free(swap);
-		} else if (move_from_swap_cache(swappage, idx, mapping) == 0) {
+		} else if (!(error = move_from_swap_cache(
+				swappage, idx, mapping))) {
 			shmem_swp_set(info, entry, 0);
 			shmem_swp_unmap(entry);
 			spin_unlock(&info->lock);
@@ -850,8 +851,10 @@ static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **p
 			spin_unlock(&info->lock);
 			unlock_page(swappage);
 			page_cache_release(swappage);
+			if (error == -ENOMEM) {
 				/* let kswapd refresh zone for GFP_ATOMICs */
 				blk_congestion_wait(WRITE, HZ/50);
+			}
 			goto repeat;
 		}
 	} else if (sgp == SGP_READ && !filepage) {
@@ -905,8 +908,6 @@ static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **p
 				filepage = NULL;
 				if (error)
 					goto failed;
-				/* let kswapd refresh zone for GFP_ATOMICs */
-				blk_congestion_wait(WRITE, HZ / 50);
 				goto repeat;
 			}
 		}