ANDROID: fuse-bpf: Rename iocb_fuse to iocb_orig

The current name is a bit confusing. iocb_fuse could refer to the iocb
passed to fuse or created by fuse. The new name unambiguously refers to
the one passed in to fuse.

Test: compiles, behavior unchanged
Bug: 217570523
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Change-Id: I955500eb8a3186252427fd06ca6e99b4fec469b6
This commit is contained in:
Daniel Rosenberg
2022-04-08 19:06:56 -07:00
parent 0f51319527
commit 8e24eb9a2d

View File

@@ -17,7 +17,7 @@
struct fuse_bpf_aio_req {
struct kiocb iocb;
struct kiocb *iocb_fuse;
struct kiocb *iocb_orig;
};
static void fuse_file_accessed(struct file *dst_file, struct file *src_file)
@@ -813,16 +813,16 @@ void *fuse_removexattr_finalize(struct fuse_args *fa,
static void fuse_bpf_aio_cleanup_handler(struct fuse_bpf_aio_req *aio_req)
{
struct kiocb *iocb = &aio_req->iocb;
struct kiocb *iocb_fuse = aio_req->iocb_fuse;
struct kiocb *iocb_orig = aio_req->iocb_orig;
if (iocb->ki_flags & IOCB_WRITE) {
__sb_writers_acquired(file_inode(iocb->ki_filp)->i_sb,
SB_FREEZE_WRITE);
file_end_write(iocb->ki_filp);
fuse_copyattr(iocb_fuse->ki_filp, iocb->ki_filp);
fuse_copyattr(iocb_orig->ki_filp, iocb->ki_filp);
}
iocb_fuse->ki_pos = iocb->ki_pos;
iocb_orig->ki_pos = iocb->ki_pos;
kfree(aio_req);
}
@@ -830,10 +830,10 @@ static void fuse_bpf_aio_rw_complete(struct kiocb *iocb, long res, long res2)
{
struct fuse_bpf_aio_req *aio_req =
container_of(iocb, struct fuse_bpf_aio_req, iocb);
struct kiocb *iocb_fuse = aio_req->iocb_fuse;
struct kiocb *iocb_orig = aio_req->iocb_orig;
fuse_bpf_aio_cleanup_handler(aio_req);
iocb_fuse->ki_complete(iocb_fuse, res, res2);
iocb_orig->ki_complete(iocb_orig, res, res2);
}
@@ -899,7 +899,7 @@ int fuse_file_read_iter_backing(struct fuse_args *fa,
aio_req = kzalloc(sizeof(struct fuse_bpf_aio_req), GFP_KERNEL);
if (!aio_req)
goto out;
aio_req->iocb_fuse = iocb;
aio_req->iocb_orig = iocb;
kiocb_clone(&aio_req->iocb, iocb, ff->backing_file);
aio_req->iocb.ki_complete = fuse_bpf_aio_rw_complete;
ret = vfs_iocb_iter_read(ff->backing_file, &aio_req->iocb, to);
@@ -991,7 +991,7 @@ int fuse_file_write_iter_backing(struct fuse_args *fa,
file_start_write(ff->backing_file);
__sb_writers_release(file_inode(ff->backing_file)->i_sb, SB_FREEZE_WRITE);
aio_req->iocb_fuse = iocb;
aio_req->iocb_orig = iocb;
kiocb_clone(&aio_req->iocb, iocb, ff->backing_file);
aio_req->iocb.ki_complete = fuse_bpf_aio_rw_complete;
ret = vfs_iocb_iter_write(ff->backing_file, &aio_req->iocb, from);