From b4464d202d8eb1dc99db9286ffcbdf19d50b4c2b Mon Sep 17 00:00:00 2001 From: Inki Dae Date: Mon, 4 Jul 2016 17:28:46 +0900 Subject: [PATCH] staging: logger: fix build error due to removed ki_nbytes This patch fixes build error. Logger driver was removed from mainline kernel and after that there was some changes and one of them is that ki_nbytes member was removed from kiocb structure. 66ee59a fs: remove ki_nbytes This patch makes count member of iov_iter structure to be used instead. Change-Id: I11e9ebdac7dd86c02fd692a67562a23e5c685f69 Signed-off-by: Inki Dae Signed-off-by: Karol Lewandowski --- drivers/staging/android/logger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 94986e1..27b2686 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "logger.h" #include @@ -421,7 +421,7 @@ static ssize_t logger_write_iter(struct kiocb *iocb, struct iov_iter *from) struct timespec now; size_t len, count, w_off; - count = min_t(size_t, iocb->ki_nbytes, LOGGER_ENTRY_MAX_PAYLOAD); + count = min_t(size_t, iov_iter_count(from), LOGGER_ENTRY_MAX_PAYLOAD); now = current_kernel_time(); -- 2.7.4