hc
2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077
kernel/fs/posix_acl.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) 2002,2003 by Andreas Gruenbacher <a.gruenbacher@computer.org>
34 *
....@@ -349,7 +350,7 @@
349350 const struct posix_acl_entry *pa, *pe, *mask_obj;
350351 int found = 0;
351352
352
- want &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
353
+ want &= MAY_READ | MAY_WRITE | MAY_EXEC;
353354
354355 FOREACH_ACL_ENTRY(pa, acl, pe) {
355356 switch(pa->e_tag) {
....@@ -630,12 +631,15 @@
630631
631632 /**
632633 * posix_acl_update_mode - update mode in set_acl
634
+ * @inode: target inode
635
+ * @mode_p: mode (pointer) for update
636
+ * @acl: acl pointer
633637 *
634638 * Update the file mode when setting an ACL: compute the new file permission
635639 * bits based on the ACL. In addition, if the ACL is equivalent to the new
636
- * file mode, set *acl to NULL to indicate that no ACL should be set.
640
+ * file mode, set *@acl to NULL to indicate that no ACL should be set.
637641 *
638
- * As with chmod, clear the setgit bit if the caller is not in the owning group
642
+ * As with chmod, clear the setgid bit if the caller is not in the owning group
639643 * or capable of CAP_FSETID (see inode_change_ok).
640644 *
641645 * Called from set_acl inode operations.
....@@ -831,7 +835,7 @@
831835 static int
832836 posix_acl_xattr_get(const struct xattr_handler *handler,
833837 struct dentry *unused, struct inode *inode,
834
- const char *name, void *value, size_t size)
838
+ const char *name, void *value, size_t size, int flags)
835839 {
836840 struct posix_acl *acl;
837841 int error;