From 049923994884b534166d862a6b346e7b8bc21e44 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 26 Jan 2021 13:31:05 -0800 Subject: [PATCH] Revert "ANDROID: Incremental fs: Fix uninitialized variable" This reverts commit 45598888d85f81838bb94e2386c7d1b5068fe2ef. Set incfs back to rvc shipping incfs Bug: 178509184 Test: incfs_test passes Signed-off-by: Paul Lawrence Change-Id: Id4f4e30a1b94adeadeebd9d734f15e0e2567cf0a --- fs/incfs/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 8c3c3b754825..f535d24d76ca 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -668,6 +668,7 @@ static long ioctl_get_block_count(struct file *f, void __user *arg) struct incfs_get_block_count_args __user *args_usr_ptr = arg; struct incfs_get_block_count_args args = {}; struct data_file *df = get_incfs_data_file(f); + int error; if (!df) return -EINVAL; @@ -681,7 +682,7 @@ static long ioctl_get_block_count(struct file *f, void __user *arg) if (copy_to_user(args_usr_ptr, &args, sizeof(args))) return -EFAULT; - return 0; + return error; } static long dispatch_ioctl(struct file *f, unsigned int req, unsigned long arg)