From: Inki Dae <inki.dae@samsung.com>
Date: Mon, 4 Jul 2016 08:28:46 +0000 (+0900)
Subject: staging: logger: fix build error due to removed ki_nbytes
X-Git-Tag: submit/tizen/20211126.100737~15^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=086d899d0092bece55e6f4bc4fc3c9f264ee7274;p=platform%2Fkernel%2Flinux-tizen-modules-source.git

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>
---

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 <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();