Revert "ANDROID: Incremental fs: Fix uninitialized variable"

This reverts commit 4559888. Set incfs back to rvc shipping incfs Bug: 178509184 Test: incfs_test passes Signed-off-by: Paul Lawrence <[email protected]> Change-Id: Id4f4e30a1b94adeadeebd9d734f15e0e2567cf0a
akeromi · Jan 26, 2021 · 0499239 · 0499239
1 parent b34943a
commit 0499239
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)