Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp6927255rdb; Fri, 15 Dec 2023 12:06:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3Z1RhuVGNTtsJJD/T3Mn4kpKYLIcbdmGqwo08piPMVAarJ3ehm1ZLnnJRg01t2ykTEGI9 X-Received: by 2002:a05:6a00:2345:b0:6bd:4ab7:5f69 with SMTP id j5-20020a056a00234500b006bd4ab75f69mr13166192pfj.12.1702670760218; Fri, 15 Dec 2023 12:06:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702670760; cv=none; d=google.com; s=arc-20160816; b=UDOiRIuwYZODFPsyG1IKiceFCS6V1CQVclQECxSOMJ+IZYfNaNC+8IOKgAQRtFFyqt d1+8TsRT8DQyoiDYNvOvYqlQ5tkr/U3L+n2y227fSZJypzOpXciS1DyRQbDoclHl/9wF zdUnmz0dJmITeagE7P+yjJGznmStd2sJEdSSegnrd/WHCAStcNGyKE3peNnPhaVpH7Q6 CLjdBFn3k7sVBI7fAMt7sYQOHRxQrWYa3HN5ov/U2qc2aaNB6b5a1+YU1YvDva39Cpzb zRDBMBg1ApKmSUhod/MsVnpZiBygrvhfSnRWMSQLVvDmqDCvokzstYO1IkC654qkjFoQ 3yVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=v+w3jrrOuwEW6c9b12xy+g71WBvRB50BeRcbxotV8AU=; fh=timWtHA7UGScEpXk98kbQKGrJEBXaf2Y1JfEnqzAnNI=; b=TaIOY7bpWWCUpmQ4LO62HI4qloPt7nbN6dJMophpYHfehqkRoJ9ViDvNAorbGmZ84x B/ZW8GvNlvSNtzVOkAZgJ5vBB8ODpC2QsImNS5VDmDGhnQFTxJqgSK8GhZHTv8iTaksJ zfurbRmQyYOLFoLlB/BDkZ+fF0goUxDHbbwDRXbnqQ1RKL8W7vo2hW6cOXrXlkbPeOIc Jk5giLjIEwSYS6rTd2DNUgTKmFGTjMTmdN0ZKYvLLuXxgjZbjQPlDK6B7gYs+xBuJNsZ 1zZIZiG9U2IDgiyNVj2ilHj7JstKAoG9uGjOuAmLaniUr1iBKrRFqdXdLeaMwEANBNFm UUDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=NpTWOJG3; spf=pass (google.com: domain of linux-kernel+bounces-1597-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1597-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id i7-20020aa78d87000000b006ce546c463dsi7822898pfr.275.2023.12.15.12.05.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 12:06:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1597-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=NpTWOJG3; spf=pass (google.com: domain of linux-kernel+bounces-1597-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1597-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 37FF1B23C8F for ; Fri, 15 Dec 2023 20:05:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3372365EC8; Fri, 15 Dec 2023 20:02:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="NpTWOJG3" X-Original-To: linux-kernel@vger.kernel.org Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C28C563AE; Fri, 15 Dec 2023 20:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=v+w3jrrOuwEW6c9b12xy+g71WBvRB50BeRcbxotV8AU=; b=NpTWOJG3eqMAQI1Owoek8oh1L6 jxonRna6pH2XUTTsHx+c91AdAMBru33Ua87kVGfze5tDyfb0tZ2xlIuIWTtyvix2ob7hhWSjHMJs5 ICHFJo3qav0HVeNEKOmAmcNkdxD/HQBHEKO6LzIHI0P3BJGb9bHKI+XnsTKJpDNhYZChGlbpvFy5D LkTfyZjCeyGg2Ps5uJynYPRzfpIEptucW5gkHKTUZ74MUzCBtKYaG19+2TFqj2iqGpyWtU/sMFNX5 xnvYp3hAl7brxshEuDZL5d8cjNsLtuZAPGZkUYhMJKgC7ZoKkhcxssOsvN50VRJ+RDR8Bnsd/Fc7e 1H6KDUmw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1rEEOV-0038jA-RE; Fri, 15 Dec 2023 20:02:47 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Christoph Hellwig , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH 09/14] minix: Remove writepage implementation Date: Fri, 15 Dec 2023 20:02:40 +0000 Message-Id: <20231215200245.748418-10-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231215200245.748418-1-willy@infradead.org> References: <20231215200245.748418-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If the filesystem implements migrate_folio and writepages, there is no need for a writepage implementation. Signed-off-by: Matthew Wilcox (Oracle) --- fs/minix/inode.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/minix/inode.c b/fs/minix/inode.c index f8af6c3ae336..73f37f298087 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -397,9 +398,10 @@ static int minix_get_block(struct inode *inode, sector_t block, return V2_minix_get_block(inode, block, bh_result, create); } -static int minix_writepage(struct page *page, struct writeback_control *wbc) +static int minix_writepages(struct address_space *mapping, + struct writeback_control *wbc) { - return block_write_full_page(page, minix_get_block, wbc); + return mpage_writepages(mapping, wbc, minix_get_block); } static int minix_read_folio(struct file *file, struct folio *folio) @@ -444,9 +446,10 @@ static const struct address_space_operations minix_aops = { .dirty_folio = block_dirty_folio, .invalidate_folio = block_invalidate_folio, .read_folio = minix_read_folio, - .writepage = minix_writepage, + .writepages = minix_writepages, .write_begin = minix_write_begin, .write_end = generic_write_end, + .migrate_folio = buffer_migrate_folio, .bmap = minix_bmap, .direct_IO = noop_direct_IO }; -- 2.42.0