From patchwork Fri Apr 19 16:42:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2466351 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7A88CDF25A for ; Fri, 19 Apr 2013 16:43:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031094Ab3DSQmq (ORCPT ); Fri, 19 Apr 2013 12:42:46 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:61360 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031065Ab3DSQmn (ORCPT ); Fri, 19 Apr 2013 12:42:43 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz11so2397795pad.16 for ; Fri, 19 Apr 2013 09:42:43 -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=fQzVrkcGy6FGDGXt5lrsdXXPqifoVTl+G06WChLQv0TePtfD/pH+ksLzkgHlA8zJlz IS/zqFZnq/gvO20MDfybP2IlPhgtqLd+L6JvvrGk9CPMiSA8bZ1TM2kFyNFWjpgrOyFx TP+NWGAWYFesUsn0EXMbctKIMkWaMtxr9y8Kt/9MG1ZSDLDIDeVw2OTUvzRNHedPRf2T TO0V0OHFwQaR6MvpcjKZgD1UZYU3yz80j7BbYmcc7XtSoLhzC8N1uKbKXlTYML97Tlh6 QRXBuo6au5EB4m6AsntkAnvkeUBHnpsMPYuhUccEBumIoqiP8Wv8RECCH+wZx5RPDJJ9 PRbQ== X-Received: by 10.68.59.167 with SMTP id a7mr1200995pbr.94.1366389763038; Fri, 19 Apr 2013 09:42:43 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id g8sm15320878pae.7.2013.04.19.09.42.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 09:42:42 -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, James.Bottomley@HansenPartnership.com, JBottomley@parallels.com Cc: linux-scsi@vger.kernel.org, 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, jcmvbkbc@gmail.com, Namjae Jeon , Namjae Jeon , Vivek Trivedi Subject: [PATCH v2 9/9] bcache: use generic helper to set max_discard_sectors Date: Sat, 20 Apr 2013 01:42:35 +0900 Message-Id: <1366389755-19621-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;