From patchwork Wed Sep 14 12:32:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9331319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F420F607FD for ; Wed, 14 Sep 2016 12:33:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E558829D87 for ; Wed, 14 Sep 2016 12:33:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D994D29D89; Wed, 14 Sep 2016 12:33:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D844A29D87 for ; Wed, 14 Sep 2016 12:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755829AbcINMdE (ORCPT ); Wed, 14 Sep 2016 08:33:04 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:34106 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755489AbcINMdD (ORCPT ); Wed, 14 Sep 2016 08:33:03 -0400 Received: by mail-lf0-f54.google.com with SMTP id u14so8867333lfd.1 for ; Wed, 14 Sep 2016 05:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=b/Qe0Jl6n4bQ4bEifR5olCp6F4E9EhNkw/xKS6CsZvM=; b=kJ9oPLM7uXusr1/z/NUTG9u6nASOlP5xK0AG77z3wjQFsXpZCZ+I+wMmJJkEmhkUqn gd9B442nlasGMCnevN6Vckp6w4SCayqAhvhkDcHjazoCcINZzgmdLbyRiuj99iY5tvRZ KwMaj0ZYQRPadDR+GI/XuxKqXcp42VgOb0eaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=b/Qe0Jl6n4bQ4bEifR5olCp6F4E9EhNkw/xKS6CsZvM=; b=ibqjkmIsEZ5zrGCkcylrR3jW4nmk3aUv2xM+pExjKNxNVJKypXM3ZhkzE5Favqe0Ly 6p5eM29er2E/IUcCASYzFpyatplzB3qY3rQLQYYGQpk0WkJaYITLLomwyeHyIzhVzYgx tCuljXozqaByWSz2KqzGLC9b51sK/I3y6dhSRZOv58C5U8Yttz3PjJHTe7LhQavVtvpf MdNJ1D8ZuvQB7E0zu326YZm5BJZMo7fykPVmACsvYxaHiN/2aPzYE7AapHqUF5Bye+M/ tTPYrH7neGcXyzLv2BEvijPk1k5kqHqQp9Urnc4MbLrIvWoclgOZ6D1Vuny7fnDhECoH wKhQ== X-Gm-Message-State: AE9vXwMnCpBVlw0CXbRwBvJ0o+XlpnLvHJaSLGP5clA9oZ4y+pa+lF80DOdsqqex3qqxRN10 X-Received: by 10.25.211.199 with SMTP id k190mr1036156lfg.71.1473856381973; Wed, 14 Sep 2016 05:33:01 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s3sm4887117lja.49.2016.09.14.05.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Sep 2016 05:33:01 -0700 (PDT) From: Linus Walleij To: linux-block@vger.kernel.org, Jens Axboe Cc: Linus Walleij Subject: [PATCH] block: remove remnant refs to hardsect Date: Wed, 14 Sep 2016 14:32:52 +0200 Message-Id: <1473856372-22204-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 "block: Do away with the notion of hardsect_size" removed the notion of "hardware sector size" from the kernel in favor of logical block size, but references remain in comments and documentation. Update the remaining sites mentioning hardsect. Signed-off-by: Linus Walleij Reviewed-by: Christoph Hellwig --- Documentation/block/biodoc.txt | 4 ++-- block/bio.c | 2 +- fs/befs/linuxvfs.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index bcdb2b4c1f12..918e1e0d0e78 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -115,7 +115,7 @@ i. Per-queue limits/values exported to the generic layer by the driver Various parameters that the generic i/o scheduler logic uses are set at a per-queue level (e.g maximum request size, maximum number of segments in -a scatter-gather list, hardsect size) +a scatter-gather list, logical block size) Some parameters that were earlier available as global arrays indexed by major/minor are now directly associated with the queue. Some of these may @@ -156,7 +156,7 @@ Some new queue property settings: blk_queue_max_segment_size(q, max_seg_size) Maximum size of a clustered segment, 64kB default. - blk_queue_hardsect_size(q, hardsect_size) + blk_queue_logical_block_size(q, logical_block_size) Lowest possible sector size that the hardware can operate on, 512 bytes default. diff --git a/block/bio.c b/block/bio.c index aa7354088008..a6d279e1ea9e 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1274,7 +1274,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, nr_pages += end - start; /* - * buffer must be aligned to at least hardsector size for now + * buffer must be aligned to at least logical block size for now */ if (uaddr & queue_dma_alignment(q)) return ERR_PTR(-EINVAL); diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 7da05b159ade..bfe9f9994935 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -789,7 +789,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) * Will be set to real fs blocksize later. * * Linux 2.4.10 and later refuse to read blocks smaller than - * the hardsect size for the device. But we also need to read at + * the logical block size for the device. But we also need to read at * least 1k to get the second 512 bytes of the volume. * -WD 10-26-01 */