Browse Source

GFS2: Increase the max number of ACLs

This patch increases the maximum number of ACLs from 25 to 300 for
a 4K block size. The value is adjusted accordingly if the block size
is smaller. Note that this is an arbitrary limit with a performance
tradeoff, and that the physical limit is slightly over 500.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Bob Peterson 11 years ago
parent
commit
b00263d1ca
2 changed files with 2 additions and 2 deletions
  1. 1 1
      fs/gfs2/acl.c
  2. 1 1
      fs/gfs2/acl.h

+ 1 - 1
fs/gfs2/acl.c

@@ -85,7 +85,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 
 
 	BUG_ON(name == NULL);
 	BUG_ON(name == NULL);
 
 
-	if (acl->a_count > GFS2_ACL_MAX_ENTRIES)
+	if (acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode)))
 		return -E2BIG;
 		return -E2BIG;
 
 
 	if (type == ACL_TYPE_ACCESS) {
 	if (type == ACL_TYPE_ACCESS) {

+ 1 - 1
fs/gfs2/acl.h

@@ -14,7 +14,7 @@
 
 
 #define GFS2_POSIX_ACL_ACCESS		"posix_acl_access"
 #define GFS2_POSIX_ACL_ACCESS		"posix_acl_access"
 #define GFS2_POSIX_ACL_DEFAULT		"posix_acl_default"
 #define GFS2_POSIX_ACL_DEFAULT		"posix_acl_default"
-#define GFS2_ACL_MAX_ENTRIES		25
+#define GFS2_ACL_MAX_ENTRIES(sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12)
 
 
 extern struct posix_acl *gfs2_get_acl(struct inode *inode, int type);
 extern struct posix_acl *gfs2_get_acl(struct inode *inode, int type);
 extern int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type);
 extern int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type);