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

Revert "ANDROID: Incremental fs: Fix misuse of cpu_to_leXX and poll return"

Browse Source 
This reverts commit 6851a6dcf2.

Set incfs back to rvc shipping incfs

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

2
fs/incfs/format.c
View File

@@ -413,7 +413,7 @@ int incfs_write_mapping_fh_to_backing_file(struct backing_file_context *bfc,
fh.fh_mapped_file_size = cpu_to_le64(file_size);
fh.fh_original_uuid = *uuid;
fh.fh_flags = cpu_to_le32(INCFS_FILE_MAPPED);
fh.fh_flags = INCFS_FILE_MAPPED;
LOCK_REQUIRED(bfc->bc_mutex);

4
fs/incfs/pseudo_files.c
View File

@@ -922,7 +922,7 @@ static long ioctl_create_mapped_file(struct mount_info *mi, void __user *arg)
}
error = init_new_mapped_file(mi, file_dentry, &args.source_file_id,
args.size, args.source_offset);
size_attr_value, cpu_to_le64(args.source_offset));
if (error)
goto delete_file;
@@ -1108,7 +1108,7 @@ static __poll_t blocks_written_poll(struct file *f, poll_table *wait)
unsigned long blocks_written;
if (!mi)
return 0;
return -EFAULT;
poll_wait(f, &mi->mi_blocks_written_notif_wq, wait);
blocks_written = atomic_read(&mi->mi_blocks_written);