github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: Incremental fs: Add uid to INCFS_IOC_GET_LAST_READ_ERROR

Browse Source 
Bug: 186796876
Test: incfs_test passes
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: I552cae5e87b004202364ba5c9c5f9febb9e106f2
This commit is contained in:
Paul Lawrence 2021-05-03 08:46:52 -07:00
parent 25c3b9e0fe
commit b6e60f0673
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/incfs/data_mgmt.c
View File

@ -1274,6 +1274,7 @@ static int incfs_update_sysfs_error(struct file *file, int index, int result,
mi->mi_le_time_us = ktime_to_us(ktime_get()); mi->mi_le_time_us = ktime_to_us(ktime_get());
mi->mi_le_page = index; mi->mi_le_page = index;
mi->mi_le_errno = result; mi->mi_le_errno = result;
mi->mi_le_uid = current_uid().val;
mutex_unlock(&mi->mi_le_mutex); mutex_unlock(&mi->mi_le_mutex);
return 0; return 0;

1
fs/incfs/data_mgmt.h
View File

@ -199,6 +199,7 @@ struct mount_info {
u64 mi_le_time_us; u64 mi_le_time_us;
u32 mi_le_page; u32 mi_le_page;
u32 mi_le_errno; u32 mi_le_errno;
uid_t mi_le_uid;
/* Number of reads timed out */ /* Number of reads timed out */
u32 mi_reads_failed_timed_out; u32 mi_reads_failed_timed_out;

1
fs/incfs/pseudo_files.c
View File

@ -1005,6 +1005,7 @@ static long ioctl_get_last_read_error(struct mount_info *mi, void __user *arg)
args.time_us_out = mi->mi_le_time_us; args.time_us_out = mi->mi_le_time_us;
args.page_out = mi->mi_le_page; args.page_out = mi->mi_le_page;
args.errno_out = mi->mi_le_errno; args.errno_out = mi->mi_le_errno;
args.uid_out = mi->mi_le_uid;
mutex_unlock(&mi->mi_le_mutex); mutex_unlock(&mi->mi_le_mutex);
if (copy_to_user(args_usr_ptr, &args, sizeof(args)) > 0) if (copy_to_user(args_usr_ptr, &args, sizeof(args)) > 0)

6
include/uapi/linux/incrementalfs.h
View File

@ -580,7 +580,11 @@ struct incfs_get_last_read_error_args {
/* errno of last read error */ /* errno of last read error */
__u32 errno_out; __u32 errno_out;
__u64 reserved; /* uid of last read error */
__u32 uid_out;
__u32 reserved1;
__u64 reserved2;
}; };
#endif /* _UAPI_LINUX_INCREMENTALFS_H */ #endif /* _UAPI_LINUX_INCREMENTALFS_H */