projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use less confusing names for iov_iter direction initializers
[platform/kernel/linux-starfive.git]
/
fs
/
read_write.c
diff --git
a/fs/read_write.c
b/fs/read_write.c
index
24b9668
..
7a2ff61
100644
(file)
--- a/
fs/read_write.c
+++ b/
fs/read_write.c
@@
-384,7
+384,7
@@
static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo
init_sync_kiocb(&kiocb, filp);
kiocb.ki_pos = (ppos ? *ppos : 0);
init_sync_kiocb(&kiocb, filp);
kiocb.ki_pos = (ppos ? *ppos : 0);
- iov_iter_ubuf(&iter,
READ
, buf, len);
+ iov_iter_ubuf(&iter,
ITER_DEST
, buf, len);
ret = call_read_iter(filp, &kiocb, &iter);
BUG_ON(ret == -EIOCBQUEUED);
ret = call_read_iter(filp, &kiocb, &iter);
BUG_ON(ret == -EIOCBQUEUED);
@@
-424,7
+424,7
@@
ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
init_sync_kiocb(&kiocb, file);
kiocb.ki_pos = pos ? *pos : 0;
init_sync_kiocb(&kiocb, file);
kiocb.ki_pos = pos ? *pos : 0;
- iov_iter_kvec(&iter,
READ
, &iov, 1, iov.iov_len);
+ iov_iter_kvec(&iter,
ITER_DEST
, &iov, 1, iov.iov_len);
ret = file->f_op->read_iter(&kiocb, &iter);
if (ret > 0) {
if (pos)
ret = file->f_op->read_iter(&kiocb, &iter);
if (ret > 0) {
if (pos)
@@
-486,7
+486,7
@@
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t
init_sync_kiocb(&kiocb, filp);
kiocb.ki_pos = (ppos ? *ppos : 0);
init_sync_kiocb(&kiocb, filp);
kiocb.ki_pos = (ppos ? *ppos : 0);
- iov_iter_ubuf(&iter,
WRIT
E, (void __user *)buf, len);
+ iov_iter_ubuf(&iter,
ITER_SOURC
E, (void __user *)buf, len);
ret = call_write_iter(filp, &kiocb, &iter);
BUG_ON(ret == -EIOCBQUEUED);
ret = call_write_iter(filp, &kiocb, &iter);
BUG_ON(ret == -EIOCBQUEUED);
@@
-533,7
+533,7
@@
ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t
.iov_len = min_t(size_t, count, MAX_RW_COUNT),
};
struct iov_iter iter;
.iov_len = min_t(size_t, count, MAX_RW_COUNT),
};
struct iov_iter iter;
- iov_iter_kvec(&iter,
WRIT
E, &iov, 1, iov.iov_len);
+ iov_iter_kvec(&iter,
ITER_SOURC
E, &iov, 1, iov.iov_len);
return __kernel_write_iter(file, &iter, pos);
}
/*
return __kernel_write_iter(file, &iter, pos);
}
/*
@@
-911,7
+911,7
@@
static ssize_t vfs_readv(struct file *file, const struct iovec __user *vec,
struct iov_iter iter;
ssize_t ret;
struct iov_iter iter;
ssize_t ret;
- ret = import_iovec(
READ
, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter);
+ ret = import_iovec(
ITER_DEST
, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter);
if (ret >= 0) {
ret = do_iter_read(file, &iter, pos, flags);
kfree(iov);
if (ret >= 0) {
ret = do_iter_read(file, &iter, pos, flags);
kfree(iov);
@@
-928,7
+928,7
@@
static ssize_t vfs_writev(struct file *file, const struct iovec __user *vec,
struct iov_iter iter;
ssize_t ret;
struct iov_iter iter;
ssize_t ret;
- ret = import_iovec(
WRIT
E, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter);
+ ret = import_iovec(
ITER_SOURC
E, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter);
if (ret >= 0) {
file_start_write(file);
ret = do_iter_write(file, &iter, pos, flags);
if (ret >= 0) {
file_start_write(file);
ret = do_iter_write(file, &iter, pos, flags);