From: Greg Kroah-Hartman Date: Fri, 9 Dec 2016 09:31:39 +0000 (+0100) Subject: 4.8-stable patches X-Git-Tag: v4.4.38~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cfd6fe79191656f7c42f586a79bff6cfc5996e7;p=thirdparty%2Fkernel%2Fstable-queue.git 4.8-stable patches added patches: constify-iov_iter_count-and-iter_is_iovec.patch --- diff --git a/queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch b/queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch new file mode 100644 index 00000000000..a4c50efca19 --- /dev/null +++ b/queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch @@ -0,0 +1,36 @@ +From b57332b4105abf1d518d93886e547ee2f98cd414 Mon Sep 17 00:00:00 2001 +From: Al Viro +Date: Mon, 10 Oct 2016 13:57:37 -0400 +Subject: constify iov_iter_count() and iter_is_iovec() + +From: Al Viro + +commit b57332b4105abf1d518d93886e547ee2f98cd414 upstream. + +[stable note, need this to prevent build warning in commit +a0ac402cfcdc904f9772e1762b3fda112dcc56a0] + +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/uio.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/linux/uio.h ++++ b/include/linux/uio.h +@@ -102,12 +102,12 @@ int iov_iter_npages(const struct iov_ite + + const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags); + +-static inline size_t iov_iter_count(struct iov_iter *i) ++static inline size_t iov_iter_count(const struct iov_iter *i) + { + return i->count; + } + +-static inline bool iter_is_iovec(struct iov_iter *i) ++static inline bool iter_is_iovec(const struct iov_iter *i) + { + return !(i->type & (ITER_BVEC | ITER_KVEC)); + } diff --git a/queue-4.8/series b/queue-4.8/series index 58ad3d5f5b8..011091005d9 100644 --- a/queue-4.8/series +++ b/queue-4.8/series @@ -36,3 +36,4 @@ sparc64-fix-find_node-warning-if-numa-node-cannot-be-found.patch sparc64-fix-compile-warning-section-mismatch-in-find_node.patch sparc32-fix-inverted-invalid_frame_pointer-checks-on-sigreturns.patch don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch +constify-iov_iter_count-and-iter_is_iovec.patch