Commit 767fcbc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d2b6f8a1 a3cc754a

arch/alpha/kernel/syscalls/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -482,3 +482,4 @@ 
550	common	process_madvise			sys_process_madvise

551	common	epoll_pwait2			sys_epoll_pwait2

552	common	mount_setattr			sys_mount_setattr

553	common	quotactl_path			sys_quotactl_path

arch/arm/tools/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -456,3 +456,4 @@ 
440	common	process_madvise			sys_process_madvise

441	common	epoll_pwait2			sys_epoll_pwait2

442	common	mount_setattr			sys_mount_setattr

443	common	quotactl_path			sys_quotactl_path

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)

#define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)



#define __NR_compat_syscalls		443

#define __NR_compat_syscalls		444

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+2 −0
Original line number Diff line number Diff line
@@ -893,6 +893,8 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) 
__SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)

#define __NR_mount_setattr 442

__SYSCALL(__NR_mount_setattr, sys_mount_setattr)

#define __NR_quotactl_path 443

__SYSCALL(__NR_quotactl_path, sys_quotactl_path)



/*

 * Please add new compat syscalls above this comment and update

arch/ia64/kernel/syscalls/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -363,3 +363,4 @@ 
440	common	process_madvise			sys_process_madvise

441	common	epoll_pwait2			sys_epoll_pwait2

442	common	mount_setattr			sys_mount_setattr

443	common	quotactl_path			sys_quotactl_path