change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/fs/posix_acl.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2002,2003 by Andreas Gruenbacher <a.gruenbacher@computer.org>
3
4
  *
..
..
@@ -349,7 +350,7 @@
349
350
 	const struct posix_acl_entry *pa, *pe, *mask_obj;
350
351
 	int found = 0;
351
352
 
352
-	want &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
353
+	want &= MAY_READ | MAY_WRITE | MAY_EXEC;
353
354
 
354
355
 	FOREACH_ACL_ENTRY(pa, acl, pe) {
355
356
                 switch(pa->e_tag) {
..
..
@@ -630,12 +631,15 @@
630
631
 
631
632
 /**
632
633
  * posix_acl_update_mode  -  update mode in set_acl
634
+ * @inode: target inode
635
+ * @mode_p: mode (pointer) for update
636
+ * @acl: acl pointer
633
637
  *
634
638
  * Update the file mode when setting an ACL: compute the new file permission
635
639
  * 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.
637
641
  *
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
639
643
  * or capable of CAP_FSETID (see inode_change_ok).
640
644
  *
641
645
  * Called from set_acl inode operations.
..
..
@@ -831,7 +835,7 @@
831
835
 static int
832
836
 posix_acl_xattr_get(const struct xattr_handler *handler,
833
837
 		    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)
835
839
 {
836
840
 	struct posix_acl *acl;
837
841
 	int error;