diff options
| author | Inki Dae <inki.dae@samsung.com> | 2016-07-04 17:28:46 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2018-03-08 10:58:21 +0900 |
| commit | eeb05d89f36e2391b1730656de7d6f0854a04474 (patch) | |
| tree | 3adf8861f49fe2671568b6d89a8b25e74dba5f4d | |
| parent | a4e64c6551cb624bb9d0415d6f7cd0edc2880dfa (diff) | |
| download | linux-rpi3-eeb05d89f36e2391b1730656de7d6f0854a04474.tar.gz linux-rpi3-eeb05d89f36e2391b1730656de7d6f0854a04474.tar.bz2 linux-rpi3-eeb05d89f36e2391b1730656de7d6f0854a04474.zip | |
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 <inki.dae@samsung.com>
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
| -rw-r--r-- | drivers/staging/android/logger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 94986e195831..27b2686266bb 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/time.h> #include <linux/vmalloc.h> -#include <linux/aio.h> +#include <linux/uio.h> #include "logger.h" #include <asm/ioctls.h> @@ -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(); |