* [merged mm-stable] fs-buffer-clean-up-block_commit_write.patch removed from -mm tree
@ 2023-08-11 22:58 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2023-08-11 22:58 UTC (permalink / raw)
To: mm-commits, willy, viro, tytso, ocfs2-devel, mark, joseph.qi,
jlbec, jack, hch, brauner, adilger.kernel, beanhuo, akpm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3159 bytes --]
The quilt patch titled
Subject: fs/buffer: clean up block_commit_write
has been removed from the -mm tree. Its filename was
fs-buffer-clean-up-block_commit_write.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Bean Huo <beanhuo@micron.com>
Subject: fs/buffer: clean up block_commit_write
Date: Mon, 26 Jun 2023 07:55:17 +0200
Originally inode is used to get blksize, after commit 45bce8f3e343
("fs/buffer.c: make block-size be per-page and protected by the page
lock"), __block_commit_write no longer uses this parameter inode.
[akpm@linux-foundation.org: remove now-unused local `inode']
Link: https://lkml.kernel.org/r/20230626055518.842392-2-beanhuo@iokpp.de
Signed-off-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Luís Henriques <ocfs2-devel@oss.oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/buffer.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
--- a/fs/buffer.c~fs-buffer-clean-up-block_commit_write
+++ a/fs/buffer.c
@@ -2180,8 +2180,7 @@ int __block_write_begin(struct page *pag
}
EXPORT_SYMBOL(__block_write_begin);
-static int __block_commit_write(struct inode *inode, struct folio *folio,
- size_t from, size_t to)
+static int __block_commit_write(struct folio *folio, size_t from, size_t to)
{
size_t block_start, block_end;
bool partial = false;
@@ -2253,7 +2252,6 @@ int block_write_end(struct file *file, s
struct page *page, void *fsdata)
{
struct folio *folio = page_folio(page);
- struct inode *inode = mapping->host;
size_t start = pos - folio_pos(folio);
if (unlikely(copied < len)) {
@@ -2277,7 +2275,7 @@ int block_write_end(struct file *file, s
flush_dcache_folio(folio);
/* This could be a short (even 0-length) commit */
- __block_commit_write(inode, folio, start, start + copied);
+ __block_commit_write(folio, start, start + copied);
return copied;
}
@@ -2601,8 +2599,7 @@ EXPORT_SYMBOL(cont_write_begin);
int block_commit_write(struct page *page, unsigned from, unsigned to)
{
struct folio *folio = page_folio(page);
- struct inode *inode = folio->mapping->host;
- __block_commit_write(inode, folio, from, to);
+ __block_commit_write(folio, from, to);
return 0;
}
EXPORT_SYMBOL(block_commit_write);
@@ -2650,7 +2647,7 @@ int block_page_mkwrite(struct vm_area_st
ret = __block_write_begin_int(folio, 0, end, get_block, NULL);
if (!ret)
- ret = __block_commit_write(inode, folio, 0, end);
+ ret = __block_commit_write(folio, 0, end);
if (unlikely(ret < 0))
goto out_unlock;
_
Patches currently in -mm which might be from beanhuo@micron.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-08-11 22:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-11 22:58 [merged mm-stable] fs-buffer-clean-up-block_commit_write.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.