Commit 777eda2c authored by Al Viro's avatar Al Viro

new helper: iter_is_iovec()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b1bc6d7f
...@@ -101,6 +101,11 @@ static inline size_t iov_iter_count(struct iov_iter *i) ...@@ -101,6 +101,11 @@ static inline size_t iov_iter_count(struct iov_iter *i)
return i->count; return i->count;
} }
static inline bool iter_is_iovec(struct iov_iter *i)
{
return !(i->type & (ITER_BVEC | ITER_KVEC));
}
/* /*
* Cap the iov_iter by given limit; note that the second argument is * Cap the iov_iter by given limit; note that the second argument is
* *not* the new size - it's upper limit for such. Passing it a value * *not* the new size - it's upper limit for such. Passing it a value
......
...@@ -2464,7 +2464,7 @@ ssize_t generic_perform_write(struct file *file, ...@@ -2464,7 +2464,7 @@ ssize_t generic_perform_write(struct file *file,
/* /*
* Copies from kernel address space cannot fail (NFSD is a big user). * Copies from kernel address space cannot fail (NFSD is a big user).
*/ */
if (segment_eq(get_fs(), KERNEL_DS)) if (!iter_is_iovec(i))
flags |= AOP_FLAG_UNINTERRUPTIBLE; flags |= AOP_FLAG_UNINTERRUPTIBLE;
do { do {
......
...@@ -1536,7 +1536,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) ...@@ -1536,7 +1536,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
* holes of a sparse file, we actually need to allocate those pages, * holes of a sparse file, we actually need to allocate those pages,
* and even mark them dirty, so it cannot exceed the max_blocks limit. * and even mark them dirty, so it cannot exceed the max_blocks limit.
*/ */
if (segment_eq(get_fs(), KERNEL_DS)) if (!iter_is_iovec(to))
sgp = SGP_DIRTY; sgp = SGP_DIRTY;
index = *ppos >> PAGE_CACHE_SHIFT; index = *ppos >> PAGE_CACHE_SHIFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment