qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fuse: drop redundant arguments to fuse_perform_write 

JIRA: https://issues.redhat.com/browse/RHEL-29564

commit 596df33d673d9d816b60b95088e59a76d845c254
Author: Christoph Hellwig <hch@lst.de>
Date:   Thu Jun 1 16:59:03 2023 +0200

    fuse: drop redundant arguments to fuse_perform_write

    pos is always equal to iocb->ki_pos, and mapping is always equal to
    iocb->ki_filp->f_mapping.

    Link: https://lkml.kernel.org/r/20230601145904.1385409-12-hch@lst.de
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
    Reviewed-by: Hannes Reinecke <hare@suse.de>
    Acked-by: Miklos Szeredi <mszeredi@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Andreas Gruenbacher <agruenba@redhat.com>
    Cc: Anna Schumaker <anna@kernel.org>
    Cc: Chao Yu <chao@kernel.org>
    Cc: Christian Brauner <brauner@kernel.org>
    Cc: "Darrick J. Wong" <djwong@kernel.org>
    Cc: Ilya Dryomov <idryomov@gmail.com>
    Cc: Jaegeuk Kim <jaegeuk@kernel.org>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Miklos Szeredi <miklos@szeredi.hu>
    Cc: Theodore Ts'o <tytso@mit.edu>
    Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: Xiubo Li <xiubli@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Ming Lei <ming.lei@redhat.com>
This commit is contained in:
Ming Lei 2023-06-01 16:59:03 +02:00
parent 4669357972
commit 69700d9e97
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/fuse/file.c
View File

@ -1230,13 +1230,13 @@ static inline unsigned int fuse_wr_pages(loff_t pos, size_t len,
max_pages);
}
static ssize_t fuse_perform_write(struct kiocb *iocb,
struct address_space *mapping,
struct iov_iter *ii, loff_t pos)
static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)
{
struct address_space *mapping = iocb->ki_filp->f_mapping;
struct inode *inode = mapping->host;
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode);
loff_t pos = iocb->ki_pos;
int err = 0;
ssize_t res = 0;
@ -1334,8 +1334,7 @@ writethrough:
if (written < 0 || !iov_iter_count(from))
goto out;
written_buffered = fuse_perform_write(iocb, mapping, from,
iocb->ki_pos);
written_buffered = fuse_perform_write(iocb, from);
if (written_buffered < 0) {
err = written_buffered;
goto out;
@ -1354,7 +1353,7 @@ writethrough:
written += written_buffered;
} else {
written = fuse_perform_write(iocb, mapping, from, iocb->ki_pos);
written = fuse_perform_write(iocb, from);
}
out:
inode_unlock(inode);