iov_iter: fix iov_iter_type

Ming Lei · axboe · commit f5eb4d3b92a6 · 2019-05-01T08:38:47.000-06:00
Commit 875f1d0 ("iov_iter: add ITER_BVEC_FLAG_NO_REF flag") introduces one extra flag of ITER_BVEC_FLAG_NO_REF, and this flag is stored into iter->type. However, iov_iter_type() doesn't consider the new added flag, fix it by masking this flag in iov_iter_type(). Fixes: 875f1d0 ("iov_iter: add ITER_BVEC_FLAG_NO_REF flag") Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/include/linux/uio.h b/include/linux/uio.h
@@ -60,7 +60,7 @@ struct iov_iter {
 
 static inline enum iter_type iov_iter_type(const struct iov_iter *i)
 {
-	return i->type & ~(READ | WRITE);
+	return i->type & ~(READ | WRITE | ITER_BVEC_FLAG_NO_REF);
 }
 
 static inline bool iter_is_iovec(const struct iov_iter *i)

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ struct iov_iter {`
`60`	`60`
`61`	`61`	`static inline enum iter_type iov_iter_type(const struct iov_iter *i)`
`62`	`62`	`{`
`63`		`- return i->type & ~(READ \| WRITE);`
	`63`	`+ return i->type & ~(READ \| WRITE \| ITER_BVEC_FLAG_NO_REF);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`static inline bool iter_is_iovec(const struct iov_iter *i)`