Commit 7ac17714 authored May 20, 2021 by Linus Torvalds

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

Pull quota fixes from Jan Kara:
 "The most important part in the pull is disablement of the new syscall
  quotactl_path() which was added in rc1.

  The reason is some people at LWN discussion pointed out dirfd would be
  useful for this path based syscall and Christian Brauner agreed.

  Without dirfd it may be indeed problematic for containers. So let's
  just disable the syscall for now when it doesn't have users yet so
  that we have more time to mull over how to best specify the filesystem
  we want to work on"

* tag 'quota_for_v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Disable quotactl_path syscall
  quota: Use 'hlist_for_each_entry' to simplify code

parents c3d0e3fd 5b9fedb3

arch/alpha/kernel/syscalls/syscall.tbl

+1 −1

Original line number	Diff line number	Diff line
		@@ -482,7 +482,7 @@
		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
		# 553 reserved for quotactl_path
		554 common landlock_create_ruleset sys_landlock_create_ruleset
		555 common landlock_add_rule sys_landlock_add_rule
		556 common landlock_restrict_self sys_landlock_restrict_self

arch/arm/tools/syscall.tbl

+1 −1

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@
		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
		# 443 reserved for quotactl_path
		444 common landlock_create_ruleset sys_landlock_create_ruleset
		445 common landlock_add_rule sys_landlock_add_rule
		446 common landlock_restrict_self sys_landlock_restrict_self

arch/arm64/include/asm/unistd32.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -893,8 +893,7 @@ __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)
		/* 443 is reserved for quotactl_path */
		#define __NR_landlock_create_ruleset 444
		__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
		#define __NR_landlock_add_rule 445

arch/ia64/kernel/syscalls/syscall.tbl

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@
		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
		# 443 reserved for quotactl_path
		444 common landlock_create_ruleset sys_landlock_create_ruleset
		445 common landlock_add_rule sys_landlock_add_rule
		446 common landlock_restrict_self sys_landlock_restrict_self

arch/m68k/kernel/syscalls/syscall.tbl

+1 −1

Original line number	Diff line number	Diff line
		@@ -442,7 +442,7 @@
		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
		# 443 reserved for quotactl_path
		444 common landlock_create_ruleset sys_landlock_create_ruleset
		445 common landlock_add_rule sys_landlock_add_rule
		446 common landlock_restrict_self sys_landlock_restrict_self