From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0DD0C77B61 for ; Mon, 24 Apr 2023 19:22:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 366876B0072; Mon, 24 Apr 2023 15:22:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3164A6B0074; Mon, 24 Apr 2023 15:22:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2051D6B0075; Mon, 24 Apr 2023 15:22:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 10DE56B0072 for ; Mon, 24 Apr 2023 15:22:47 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C68061A02F0 for ; Mon, 24 Apr 2023 19:22:46 +0000 (UTC) X-FDA: 80717256732.24.1FC1E5D Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf01.hostedemail.com (Postfix) with ESMTP id 6FCDE40011 for ; Mon, 24 Apr 2023 19:22:43 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=jnaw2GVR; spf=none (imf01.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=rdunlap@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682364165; a=rsa-sha256; cv=none; b=43y2XnwYxL/G6kCy4eRFzMeIiXkLPO0bFxqcRZlO8i3gskzsEncjbvEMDGUWJ76gpoRceg 7MRawy1m9JnPTbumUyTaVbrYApFV4oLH+XS5Nv1I7W1SjZ6v5bSjf+mmz2iTafTT1hSN1A 1V981mrVjjHRbHNy9cIIrXK1rfS0988= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=jnaw2GVR; spf=none (imf01.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=rdunlap@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682364165; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nrJOvD5ki07BgC1+m6zA5u3PXXHEIqqCNZygV4WG4uU=; b=Hqt5LUB0NbGE+Jhn+CXXVQ3sbYCBREoks+eOpiX9M4P40zFY5rD99UsLMJR2ehbe2eT48o tSyDYPmnBdVLlrTmIZygngzJPZaqDiPnZ509bHu2v/xW3DyQO5pMRvhbJjFmqAgvC3QgBm R9YQ96BwE3F4t7khd03TU6XNn+X7XUg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Sender:Reply-To:Content-ID:Content-Description; bh=nrJOvD5ki07BgC1+m6zA5u3PXXHEIqqCNZygV4WG4uU=; b=jnaw2GVRUGJ3XgLDcnTm28/EGW I2c3SbIfk7aZCwr+R62bxYgluHATBsXpKHRc3Kd6eZ7X7q4C2PFIRnKN2s2rlLjl0PYv4/SHsIN/P Rj2zV9EqLlkLs/pB1Tdm+dvzQqZ3dxlb0SloO08wS4cUh9bmguHSZK/++Sq79+k4zzVbiIuZ6QX0S G/8MCyWL3hZerN11vkKzieKj7slIpAxQGdYJVp+7U764B2QvlYl7+o1DeyOxzKUG+7D0WMFdPQDdQ HSq8SrEJKQQidA3dpPqgpftvseREm3IU//74IrRNpeEcmqw1SOz1YOqefNqU0PC23jpEwwctyAAtq 26XseFOA==; Received: from [2601:1c2:980:9ec0::2764] by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pr1lf-00H3HP-0y; Mon, 24 Apr 2023 19:22:31 +0000 Message-ID: <5f30b56e-b46b-1d3f-75fb-7f30ff6ca3e9@infradead.org> Date: Mon, 24 Apr 2023 12:22:30 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH 02/17] fs: remove the special !CONFIG_BLOCK def_blk_fops Content-Language: en-US To: Christoph Hellwig , Jens Axboe Cc: Miklos Szeredi , "Darrick J. Wong" , Andrew Morton , David Howells , Matthew Wilcox , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, ceph-devel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20230424054926.26927-1-hch@lst.de> <20230424054926.26927-3-hch@lst.de> From: Randy Dunlap In-Reply-To: <20230424054926.26927-3-hch@lst.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 6FCDE40011 X-Rspamd-Server: rspam01 X-Stat-Signature: sbwc6ngdyhww8qefawzo63m6pewzjgxe X-HE-Tag: 1682364163-378236 X-HE-Meta: U2FsdGVkX1+sFQvNU3d9rdfGUOamANgKap6YVWyLZkNI9E5PcgK7fmuy5mqnSf47s+XLPd24juJYMMHM+k+D+kLDoJX/Qhr6M7ccFsT0w+Npb6ieWc/ECFIcPdULR196+wkD9QFRc7iwYCFBjswv7eG77lrvYBPTmMzb7yxmJOMggLMxpjHfrme8Lo2XmRSJdMm79hbRI0DLK7EJbU9Imf+5IWN4qBuraQjRkvJdIFVBA8fiNfR81glcM8qBt2BLfwcrEGLKUTN8qKXkARC5E1YGPPf6KLQTLjMUIcXMtdyzTAUe3IapGzxdNWGjn2+VkcbvG0QteAdJ6zx/n1HmKgyYgKAY3TXjM75U7cYqskWxQmvzGdfmIgTCDAcxdWiBkvU53szHn3jwzQCbr4NOWUoOr62DdPeI4lsFCtb2Rdg41xB2fOTTwIPSyHeD5SocFAiZFiAEP1+sif7p+vgJSCMvPR3Mwe8j7Dvf1Z++CaD/dNpk7KKGr3WzPxVh0EmD4yDrwSye3QDulNn2Lqzh0m1YoeQ3v46Xk6NVQftk4Dd2Ir0ngJrvDVGm3FG1VdBHSd1rPOWsAl4YGFjissV//aqVphXB2a5cOZmxE8icPwjnwECMUzDu8GrPcCiIzW4lFWPhsMfwn558ziT18MZIvSaZA30N1rR2cgUui3drWQEdvb9sr0djAV87sLZAYz2slfubBl5/y8p8j9hqCnNFJDGLqcjcT6yA9oCJgGpNvwNteHea/5AU6pyCROm0vx054rqcTxcdXQw+7vHHsYqK89pvz85ujXkVWuhDHcKDjv0pRVELkmsDbf/6Wl2zaVh/6cVJFlC7tofKom9I3VEBg54HTfyvd3vztdZxP6rkhBUXn9SqyGWYQ5/Mjm5hQH+MHU95Qhj+Yr1TVWgK1C5jL2bR8j1/1gatt4H8ASax8OGUhj6Foh3pYYEzShUOC6zHgBJul/ZUuQ5hiB7Rlkr tBGHQz7L dvd/W6y53LqLEw4puPSrdkV1+qBxroEl+rMUxP15phRBYMCUnccLG8FOYrkKe6JsrhkWNow74fXzSqf/zCGR19k0TiFI47wigrZfHI3kTH5sdbgFobCs6MgKr1hEhpy/445hz+TqJwfuZuKTPEBtwPafuJZU+O03KH67ta3xS97u93otBrryTT8gOhe46N2B66344FPKLnxF1iPfc3ReTqEBY+WPPWvRyy6HKT43yIg8nbLcf6oTMoYvU4TR5F4sBCvuEm3d9nfreD3HRP2EmUfYoalEmIeT5lGxUO92+8j4TaMQfotb3kNSFGoibnvM45i+y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi, On 4/23/23 22:49, Christoph Hellwig wrote: > def_blk_fops always returns -ENODEV, which dosn't match the return value > of a non-existing block device with CONFIG_BLOCK, which is -ENXIO. > Just remove the extra implementation and fall back to the default > no_open_fops that always returns -ENXIO. > > Signed-off-by: Christoph Hellwig > --- > fs/Makefile | 10 ++-------- > fs/inode.c | 3 ++- > fs/no-block.c | 19 ------------------- > 3 files changed, 4 insertions(+), 28 deletions(-) > delete mode 100644 fs/no-block.c > > diff --git a/fs/Makefile b/fs/Makefile > index 05f89b5c962f88..da21e7d0a1cf37 100644 > --- a/fs/Makefile > +++ b/fs/Makefile > @@ -18,14 +18,8 @@ obj-y := open.o read_write.o file_table.o super.o \ > fs_types.o fs_context.o fs_parser.o fsopen.o init.o \ > kernel_read_file.o mnt_idmapping.o remap_range.o > > -ifeq ($(CONFIG_BLOCK),y) > -obj-y += buffer.o mpage.o > -else > -obj-y += no-block.o > -endif > - > -obj-$(CONFIG_PROC_FS) += proc_namespace.o > - > +obj-$(CONFIG_BLOCK) += buffer.o mpage.o > +obj-$(CONFIG_PROC_FS) += proc_namespace.o > obj-$(CONFIG_LEGACY_DIRECT_IO) += direct-io.o > obj-y += notify/ > obj-$(CONFIG_EPOLL) += eventpoll.o > diff --git a/fs/inode.c b/fs/inode.c > index 4558dc2f135573..d43f07f146eb73 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -2265,7 +2265,8 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev) > inode->i_fop = &def_chr_fops; > inode->i_rdev = rdev; > } else if (S_ISBLK(mode)) { > - inode->i_fop = &def_blk_fops; > + if (IS_ENABLED(CONFIG_BLOCK)) > + inode->i_fop = &def_blk_fops; It looks like def_blk_fops is being removed (commit message and patch fragment below), but here (above line) it is being used. Am I just confused? > inode->i_rdev = rdev; > } else if (S_ISFIFO(mode)) > inode->i_fop = &pipefifo_fops; > diff --git a/fs/no-block.c b/fs/no-block.c > deleted file mode 100644 > index 481c0f0ab4bd2c..00000000000000 > --- a/fs/no-block.c > +++ /dev/null > @@ -1,19 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-or-later > -/* no-block.c: implementation of routines required for non-BLOCK configuration > - * > - * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. > - * Written by David Howells (dhowells@redhat.com) > - */ > - > -#include > -#include > - > -static int no_blkdev_open(struct inode * inode, struct file * filp) > -{ > - return -ENODEV; > -} > - > -const struct file_operations def_blk_fops = { > - .open = no_blkdev_open, > - .llseek = noop_llseek, > -}; -- ~Randy