Merge tag 'for-5.3/io_uring-20190711' of git://git.kernel.dk/linux-block

[linux-block.git] / include / linux / uio.h

diff --git a/include/linux/uio.h b/include/linux/uio.h
index a61ceb6575ab83333f28819a9492286d539dd87d..ab5f523bc0df90a5eadd6ab92c3e9f0f3b4c2c64 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -1,10 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *     Berkeley style UIO structures   -       Alan Cox 1994.
- *
- *             This program is free software; you can redistribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
  */
 #ifndef __LINUX_UIO_H
 #define __LINUX_UIO_H
@@ -23,9 +19,6 @@ struct kvec {
 };
 
 enum iter_type {
-       /* set if ITER_BVEC doesn't hold a bv_page ref */
-       ITER_BVEC_FLAG_NO_REF = 2,
-
        /* iter types */
        ITER_IOVEC = 4,
        ITER_KVEC = 8,
@@ -60,7 +53,7 @@ struct iov_iter {
 
 static inline enum iter_type iov_iter_type(const struct iov_iter *i)
 {
-       return i->type & ~(READ | WRITE | ITER_BVEC_FLAG_NO_REF);
+       return i->type & ~(READ | WRITE);
 }
 
 static inline bool iter_is_iovec(const struct iov_iter *i)
@@ -93,11 +86,6 @@ static inline unsigned char iov_iter_rw(const struct iov_iter *i)
        return i->type & (READ | WRITE);
 }
 
-static inline bool iov_iter_bvec_no_ref(const struct iov_iter *i)
-{
-       return (i->type & ITER_BVEC_FLAG_NO_REF) != 0;
-}
-
 /*
  * Total number of bytes covered by an iovec.
  *