From patchwork Sat Apr 13 13:40:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2440731 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A8F743FC71 for ; Sat, 13 Apr 2013 13:40:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753825Ab3DMNk3 (ORCPT ); Sat, 13 Apr 2013 09:40:29 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:40532 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753405Ab3DMNk2 (ORCPT ); Sat, 13 Apr 2013 09:40:28 -0400 Received: by mail-pb0-f43.google.com with SMTP id md4so1840955pbc.2 for ; Sat, 13 Apr 2013 06:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=x7VeK69sFzpE0k7kiUDXW/2az+H9dzF6XsYEvBG/0rU=; b=a4o/2Ajo3Ee3nWi7Act5V4zM7R7fmG+Rw6yV+Jkw0otyfXwfCVkrHIEVxssYx6ofM2 Aaa7/1wTF2qkWCRloZAe/H10dbdM6zmTCkudkQ8RKTZEFNArlDuOmEth06HZg5a6PMpH egCQQFymv5Qtc/ZPvpyZJKHqsOG+guaUGUlk/a8fVT9CGuXWinEggsMJBDMpXCCT/nT/ OK+v7Q54OfnaH7CN/olfUDtcQw4xXiJYiyOzJRmppkje7PfEZKODRygpqXDNpPYGDiY4 uDv7SzY/wedo4jNK9I3b9JvDGO+Gi2W8xwGwJeqxsn/p0XB1vvK3saR1WMCQAuyox5Eh HjRw== X-Received: by 10.67.3.39 with SMTP id bt7mr20409872pad.161.1365860427144; Sat, 13 Apr 2013 06:40:27 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id mt13sm12677429pbc.15.2013.04.13.06.40.22 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Apr 2013 06:40:26 -0700 (PDT) From: Namjae Jeon To: dwmw2@infradead.org, axboe@kernel.dk, shli@kernel.org, Paul.Clements@steeleye.com, npiggin@kernel.dk, neilb@suse.de, cjb@laptop.org, adrian.hunter@intel.com Cc: linux-mtd@lists.infradead.org, nbd-general@lists.sourceforge.net, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Namjae Jeon , Namjae Jeon , Vivek Trivedi Subject: [PATCH 8/8] bcache: use generic helper to set max_discard_sectors Date: Sat, 13 Apr 2013 22:40:16 +0900 Message-Id: <1365860416-21499-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Namjae Jeon It is better to use blk_queue_max_discard_sectors helper function to set max_discard_sectors as it checks max_discard_sectors upper limit UINT_MAX >> 9 similar issue was reported for mmc in below link https://lkml.org/lkml/2013/4/1/292 If multiple discard requests get merged, merged discard request's size exceeds 4GB, there is possibility that merged discard request's __data_len field may overflow. This patch fixes this issue. Signed-off-by: Namjae Jeon Signed-off-by: Vivek Trivedi --- drivers/md/bcache/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index f3bf310..d87ab31 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -746,7 +746,7 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size) q->limits.max_sectors = UINT_MAX; q->limits.max_segment_size = UINT_MAX; q->limits.max_segments = BIO_MAX_PAGES; - q->limits.max_discard_sectors = UINT_MAX; + blk_queue_max_discard_sectors(q, UINT_MAX >> 9); q->limits.io_min = block_size; q->limits.logical_block_size = block_size; q->limits.physical_block_size = block_size;