Received: by 10.223.176.5 with SMTP id f5csp138358wra; Mon, 5 Feb 2018 18:28:00 -0800 (PST) X-Google-Smtp-Source: AH8x2273sNGR1Q1vggt9cqudU9IDLKhDtc4F1eDdiNxF08ioir6UaXgyxcTeRvxuNvsr53kuC/LH X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr873801plf.48.1517884080288; Mon, 05 Feb 2018 18:28:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517884080; cv=none; d=google.com; s=arc-20160816; b=snuM3xsisu2WnjV4xj1T5ZLFVIviSC6x9UN8RFbULVjR/GLDyMGrb1oSEtlCHI/gpG Ng2XlDHQgCOEXqMoPM/ZfH9Ve3NrgCb1EKpAVKDsLuxh9cZiyugy2M168F33x6qZhTJA 5/HJS/Y2nnqpWRXFmHbBtCbMgQL/2N+pcB4N5WkJa1icN/iXwI9fKG2d2EqqtHZB5Ewh poZYcI2pgSvgGL+f+gdxVgXQTY1Qo4R0DX5QViJ3+xe2RRAKbRTfICRoyeucwfdx7/kK K+dSnnY/Gk/BIZanuIpSugXDAWC9lsZA8bZD6sop7w4Pwmwr/3fWrPymUfSN5OnKZuaI N3Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:arc-authentication-results; bh=j8FeNfYh288Bn8G0Qcd6CqtxYBMRZoV72TK8w3/AgZM=; b=zFDp4YMP4aG/vyy2yHOF8qr4kQieEGFrht0LgWuoYVSWc0dkHYvMrs2ny928AIbhg2 MEBVgS/HIGU3bnyejo3qCacSJiojj692NO6LmtlBmbw5X1Q/A0NWaVrOe2IU7IaePW+R IZ47FDy8E1qAm4GNgDALF4UWi9dDqgGOiT6FYfEsO9rfLtCJ4BhYxhWn+5KTZQeuxbHh OuxJxHZTiQ6EZQuhDo6vEYvf11gV12ouTL9Bv7YM71vD0oiG2FQURjnwGpHuc85B7kNv Fa3rzL4nND+H3qwzvO3ZAudIfn+eU5rSIXWEDpTMYFAdgCLonvAf62KGaq+fi/KTjZZA iOfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=csail.mit.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q76si721200pfj.189.2018.02.05.18.27.43; Mon, 05 Feb 2018 18:28:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=csail.mit.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbeBFCZg (ORCPT + 99 others); Mon, 5 Feb 2018 21:25:36 -0500 Received: from outgoing-stata.csail.mit.edu ([128.30.2.210]:44249 "EHLO outgoing-stata.csail.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752069AbeBFCZa (ORCPT ); Mon, 5 Feb 2018 21:25:30 -0500 Received: from 67-148-5-85.dia.static.qwest.net ([67.148.5.85] helo=[127.0.1.1]) by outgoing-stata.csail.mit.edu with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1eiswr-000R0s-6q; Mon, 05 Feb 2018 21:25:29 -0500 Subject: [PATCH 2/2] block, char_dev: Use correct format specifier for unsigned ints From: "Srivatsa S. Bhat" To: gregkh@linuxfoundation.org, logang@deltatee.com Cc: axboe@kernel.dk, jlayton@poochiereds.net, bfields@fieldses.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, srivatsa@csail.mit.edu Date: Mon, 05 Feb 2018 18:25:27 -0800 Message-ID: <151788391701.28069.13145257664735983272.stgit@srivatsa-ubuntu> In-Reply-To: <151788389652.28069.6065922071875812126.stgit@srivatsa-ubuntu> References: <151788389652.28069.6065922071875812126.stgit@srivatsa-ubuntu> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srivatsa S. Bhat register_blkdev() and __register_chrdev_region() treat the major number as an unsigned int. So print it the same way to avoid absurd error statements such as: "... major requested (-1) is greater than the maximum (511) ..." (and also fix off-by-one bugs in the error prints). While at it, also update the comment describing register_blkdev(). Signed-off-by: Srivatsa S. Bhat --- block/genhd.c | 19 +++++++++++-------- fs/char_dev.c | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 88a53c1..21a18e5 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -308,19 +308,22 @@ void blkdev_show(struct seq_file *seqf, off_t offset) /** * register_blkdev - register a new block device * - * @major: the requested major device number [1..255]. If @major = 0, try to - * allocate any unused major number. + * @major: the requested major device number [1..BLKDEV_MAJOR_MAX-1]. If + * @major = 0, try to allocate any unused major number. * @name: the name of the new block device as a zero terminated string * * The @name must be unique within the system. * * The return value depends on the @major input parameter: * - * - if a major device number was requested in range [1..255] then the - * function returns zero on success, or a negative error code + * - if a major device number was requested in range [1..BLKDEV_MAJOR_MAX-1] + * then the function returns zero on success, or a negative error code * - if any unused major number was requested with @major = 0 parameter * then the return value is the allocated major number in range - * [1..255] or a negative error code otherwise + * [1..BLKDEV_MAJOR_MAX-1] or a negative error code otherwise + * + * See Documentation/admin-guide/devices.txt for the list of allocated + * major numbers. */ int register_blkdev(unsigned int major, const char *name) { @@ -347,8 +350,8 @@ int register_blkdev(unsigned int major, const char *name) } if (major >= BLKDEV_MAJOR_MAX) { - pr_err("register_blkdev: major requested (%d) is greater than the maximum (%d) for %s\n", - major, BLKDEV_MAJOR_MAX, name); + pr_err("register_blkdev: major requested (%u) is greater than the maximum (%u) for %s\n", + major, BLKDEV_MAJOR_MAX-1, name); ret = -EINVAL; goto out; @@ -375,7 +378,7 @@ int register_blkdev(unsigned int major, const char *name) ret = -EBUSY; if (ret < 0) { - printk("register_blkdev: cannot get major %d for %s\n", + printk("register_blkdev: cannot get major %u for %s\n", major, name); kfree(p); } diff --git a/fs/char_dev.c b/fs/char_dev.c index 33c9385..a279c58 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -121,8 +121,8 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, } if (major >= CHRDEV_MAJOR_MAX) { - pr_err("CHRDEV \"%s\" major requested (%d) is greater than the maximum (%d)\n", - name, major, CHRDEV_MAJOR_MAX); + pr_err("CHRDEV \"%s\" major requested (%u) is greater than the maximum (%u)\n", + name, major, CHRDEV_MAJOR_MAX-1); ret = -EINVAL; goto out; }