From patchwork Sat Apr 13 13:38:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2440681 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 02E5DDFB78 for ; Sat, 13 Apr 2013 13:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753720Ab3DMNi5 (ORCPT ); Sat, 13 Apr 2013 09:38:57 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:63487 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753509Ab3DMNiy (ORCPT ); Sat, 13 Apr 2013 09:38:54 -0400 Received: by mail-pd0-f178.google.com with SMTP id w11so1830470pde.9 for ; Sat, 13 Apr 2013 06:38:54 -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=Ekv4ePVQupaxt64Af0zlIq6FkJiEc6MSowaN7rnMi4A=; b=CEOPNZ7YvbWBJw1vJ/JS0o55cGSF6JS2pvCdBNzPOt4YmTEEjSwlHFf5WY2QH8DPkM iXpTenW1NobzLQ1VT6nO7ANzvS4UURyHpSDOnPa5YTTnVDqR8yT1S5oWMGD6Tk4/7S1U iZzlnxOW7Sca+dAXBtVnBq90XsRSdZN/kaav8MXdaFNKYpUVphifYqhNDBE2sn6e9ZEx Ur0rorE98p9PFYAraRXd22qsdMeJ7G6/764uqGpkaucbuUQkwOy6z6Vq/J6888SbcJCE NpdIYIqmK6cv2GB0zNHJ39/L5jy//Tigh9D+/1tuks2Uy9hbhXBLwoSXzGpIkbpH/ywF +MxA== X-Received: by 10.66.157.195 with SMTP id wo3mr20645161pab.79.1365860334108; Sat, 13 Apr 2013 06:38:54 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id do4sm12682230pbc.8.2013.04.13.06.38.50 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Apr 2013 06:38:53 -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 3/8] mtd: use generic helper to set max_discard_sectors Date: Sat, 13 Apr 2013 22:38:44 +0900 Message-Id: <1365860324-21295-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/mtd/mtd_blkdevs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 5ad39bb..cf35f99 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -417,7 +417,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) if (tr->discard) { queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, new->rq); - new->rq->limits.max_discard_sectors = UINT_MAX; + blk_queue_max_discard_sectors(new->rq, UINT_MAX >> 9); } gd->queue = new->rq;