From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751392AbdILChr (ORCPT ); Mon, 11 Sep 2017 22:37:47 -0400 Received: from LGEAMRELO11.lge.com ([156.147.23.51]:34985 "EHLO lgeamrelo11.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751045AbdILChX (ORCPT ); Mon, 11 Sep 2017 22:37:23 -0400 X-Original-SENDERIP: 156.147.1.126 X-Original-MAILFROM: minchan@kernel.org X-Original-SENDERIP: 10.177.220.163 X-Original-MAILFROM: minchan@kernel.org From: Minchan Kim To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team , Minchan Kim , Ilya Dryomov , Sergey Senozhatsky , "Huang, Ying" Subject: [PATCH 4/5] mm:swap: respect page_cluster for readahead Date: Tue, 12 Sep 2017 11:37:12 +0900 Message-Id: <1505183833-4739-4-git-send-email-minchan@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505183833-4739-1-git-send-email-minchan@kernel.org> References: <1505183833-4739-1-git-send-email-minchan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org page_cluster 0 means "we don't want readahead" so in the case, let's skip the readahead detection logic. Cc: "Huang, Ying" Signed-off-by: Minchan Kim --- include/linux/swap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 0f54b491e118..739d94397c47 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -427,7 +427,8 @@ extern bool has_usable_swap(void); static inline bool swap_use_vma_readahead(void) { - return READ_ONCE(swap_vma_readahead) && !atomic_read(&nr_rotate_swap); + return page_cluster > 0 && READ_ONCE(swap_vma_readahead) + && !atomic_read(&nr_rotate_swap); } /* Swap 50% full? Release swapcache more aggressively.. */ -- 2.7.4