summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBean Huo <beanhuo@micron.com>2023-06-26 07:55:17 +0200
committerAndrew Morton <akpm@linux-foundation.org>2023-08-18 10:12:06 -0700
commit489b7e72a63cbda11b3a2cd6c895b22917d53065 (patch)
treeeca36e75d2770d984ed15f636a8b468b9a9805af
parent1a7d018dc38b6851c602b448bdac2e78b46857db (diff)
downloadlinux-starfive-489b7e72a63cbda11b3a2cd6c895b22917d53065.tar.gz
linux-starfive-489b7e72a63cbda11b3a2cd6c895b22917d53065.tar.bz2
linux-starfive-489b7e72a63cbda11b3a2cd6c895b22917d53065.zip
fs/buffer: clean up block_commit_write
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>
-rw-r--r--fs/buffer.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index bd091329026c..a23af7826d1c 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2180,8 +2180,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len,
}
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, struct address_space *mapping,
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, struct address_space *mapping,
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_struct *vma, struct vm_fault *vmf,
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;