Skip to content

Commit 5dcdc43

Browse files
Jiufei XueMiklos Szeredi
authored andcommitted
vfs: add vfs_iocb_iter_[read|write] helper functions
This doesn't cause any behavior changes and will be used by overlay async IO implementation. Signed-off-by: Jiufei Xue <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
1 parent 1346416 commit 5dcdc43

File tree

2 files changed

+72
-0
lines changed

2 files changed

+72
-0
lines changed

fs/read_write.c

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,34 @@ static ssize_t do_iter_read(struct file *file, struct iov_iter *iter,
939939
return ret;
940940
}
941941

942+
ssize_t vfs_iocb_iter_read(struct file *file, struct kiocb *iocb,
943+
struct iov_iter *iter)
944+
{
945+
size_t tot_len;
946+
ssize_t ret = 0;
947+
948+
if (!file->f_op->read_iter)
949+
return -EINVAL;
950+
if (!(file->f_mode & FMODE_READ))
951+
return -EBADF;
952+
if (!(file->f_mode & FMODE_CAN_READ))
953+
return -EINVAL;
954+
955+
tot_len = iov_iter_count(iter);
956+
if (!tot_len)
957+
goto out;
958+
ret = rw_verify_area(READ, file, &iocb->ki_pos, tot_len);
959+
if (ret < 0)
960+
return ret;
961+
962+
ret = call_read_iter(file, iocb, iter);
963+
out:
964+
if (ret >= 0)
965+
fsnotify_access(file);
966+
return ret;
967+
}
968+
EXPORT_SYMBOL(vfs_iocb_iter_read);
969+
942970
ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos,
943971
rwf_t flags)
944972
{
@@ -975,6 +1003,34 @@ static ssize_t do_iter_write(struct file *file, struct iov_iter *iter,
9751003
return ret;
9761004
}
9771005

1006+
ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,
1007+
struct iov_iter *iter)
1008+
{
1009+
size_t tot_len;
1010+
ssize_t ret = 0;
1011+
1012+
if (!file->f_op->write_iter)
1013+
return -EINVAL;
1014+
if (!(file->f_mode & FMODE_WRITE))
1015+
return -EBADF;
1016+
if (!(file->f_mode & FMODE_CAN_WRITE))
1017+
return -EINVAL;
1018+
1019+
tot_len = iov_iter_count(iter);
1020+
if (!tot_len)
1021+
return 0;
1022+
ret = rw_verify_area(WRITE, file, &iocb->ki_pos, tot_len);
1023+
if (ret < 0)
1024+
return ret;
1025+
1026+
ret = call_write_iter(file, iocb, iter);
1027+
if (ret > 0)
1028+
fsnotify_modify(file);
1029+
1030+
return ret;
1031+
}
1032+
EXPORT_SYMBOL(vfs_iocb_iter_write);
1033+
9781034
ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos,
9791035
rwf_t flags)
9801036
{

include/linux/fs.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,6 +2078,18 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
20782078
};
20792079
}
20802080

2081+
static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src,
2082+
struct file *filp)
2083+
{
2084+
*kiocb = (struct kiocb) {
2085+
.ki_filp = filp,
2086+
.ki_flags = kiocb_src->ki_flags,
2087+
.ki_hint = kiocb_src->ki_hint,
2088+
.ki_ioprio = kiocb_src->ki_ioprio,
2089+
.ki_pos = kiocb_src->ki_pos,
2090+
};
2091+
}
2092+
20812093
/*
20822094
* Inode state bits. Protected by inode->i_lock
20832095
*
@@ -3108,6 +3120,10 @@ ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *ppos,
31083120
rwf_t flags);
31093121
ssize_t vfs_iter_write(struct file *file, struct iov_iter *iter, loff_t *ppos,
31103122
rwf_t flags);
3123+
ssize_t vfs_iocb_iter_read(struct file *file, struct kiocb *iocb,
3124+
struct iov_iter *iter);
3125+
ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,
3126+
struct iov_iter *iter);
31113127

31123128
/* fs/block_dev.c */
31133129
extern ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to);

0 commit comments

Comments
 (0)