shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: Incremental fs: Fix uninitialized variable"

Browse Source 
This reverts commit 45598888d8.

Set incfs back to rvc shipping incfs

Bug: 178509184
Test: incfs_test passes
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Id4f4e30a1b94adeadeebd9d734f15e0e2567cf0a
This commit is contained in:
Paul Lawrence
2021-01-26 13:31:05 -08:00
parent b34943af9f
commit 0499239948
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/incfs/vfs.c
View File

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