History

Merge tag 'for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull quota, ext2, reiserfs updates from Jan Kara: - support for path (instead of device) based quotactl syscall (quotactl_path(2)) - ext2 conversion to kmap_local() - other minor cleanups & fixes * tag 'for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fs/reiserfs/journal.c: delete useless variables fs/ext2: Replace kmap() with kmap_local_page() ext2: Match up ext2_put_page() with ext2_dotdot() and ext2_find_entry() fs/ext2/: fix misspellings using codespell tool quota: report warning limits for realtime space quotas quota: wire up quotactl_path quota: Add mountpath based quota support

Linus Torvalds committed 5 years ago

Commit 767fcbc2 parents d2b6f8a a3cc75428 files · +168 −62Browse files

Showing the changes to include/uapi (2 of 28 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/unistd.h +3 −1
  2. include/uapi/linux/dqblk_xfs.h +4 −1
include/uapi/asm-generic/unistd.h+3−1
@@ -863,9 +863,11 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) · 862 unmodified lines
863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
864#define __NR_mount_setattr 442864#define __NR_mount_setattr 442
865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
866#define __NR_quotactl_path 443
867__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
866 868
867#undef __NR_syscalls869#undef __NR_syscalls
868#define __NR_syscalls 443870#define __NR_syscalls 444
869 871
870/*872/*
871 * 32 bit systems traditionally used different873 * 32 bit systems traditionally used different
include/uapi/linux/dqblk_xfs.h+4−1
@@ -219,7 +219,10 @@ struct fs_quota_statv { · 218 unmodified lines
219 __s32 qs_rtbtimelimit;/* limit for rt blks timer */219 __s32 qs_rtbtimelimit;/* limit for rt blks timer */
220 __u16 qs_bwarnlimit; /* limit for num warnings */220 __u16 qs_bwarnlimit; /* limit for num warnings */
221 __u16 qs_iwarnlimit; /* limit for num warnings */221 __u16 qs_iwarnlimit; /* limit for num warnings */
222 __u64 qs_pad2[8]; /* for future proofing */222 __u16 qs_rtbwarnlimit;/* limit for rt blks warnings */
223 __u16 qs_pad3;
224 __u32 qs_pad4;
225 __u64 qs_pad2[7]; /* for future proofing */
223};226};
224 227
225#endif /* _LINUX_DQBLK_XFS_H */228#endif /* _LINUX_DQBLK_XFS_H */