use less confusing names for iov_iter direction initializers

[linux-block.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index 0878b852b355caf4fa41e828a67387e2457509c6..5969b7a1d353a8923452415140bfd743b2f188c8 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -303,7 +303,7 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
        struct kiocb kiocb;
        int ret;
 
-       iov_iter_pipe(&to, READ, pipe, len);
+       iov_iter_pipe(&to, ITER_DEST, pipe, len);
        init_sync_kiocb(&kiocb, in);
        kiocb.ki_pos = *ppos;
        ret = call_read_iter(in, &kiocb, &to);
@@ -682,7 +682,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
                        n++;
                }
 
-               iov_iter_bvec(&from, WRITE, array, n, sd.total_len - left);
+               iov_iter_bvec(&from, ITER_SOURCE, array, n, sd.total_len - left);
                ret = vfs_iter_write(out, &from, &sd.pos, 0);
                if (ret <= 0)
                        break;
@@ -1263,9 +1263,9 @@ static int vmsplice_type(struct fd f, int *type)
        if (!f.file)
                return -EBADF;
        if (f.file->f_mode & FMODE_WRITE) {
-               *type = WRITE;
+               *type = ITER_SOURCE;
        } else if (f.file->f_mode & FMODE_READ) {
-               *type = READ;
+               *type = ITER_DEST;
        } else {
                fdput(f);
                return -EBADF;
@@ -1314,7 +1314,7 @@ SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov,
 
        if (!iov_iter_count(&iter))
                error = 0;
-       else if (iov_iter_rw(&iter) == WRITE)
+       else if (type == ITER_SOURCE)
                error = vmsplice_to_pipe(f.file, &iter, flags);
        else
                error = vmsplice_to_user(f.file, &iter, flags);