Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df336ec authored by Al Viro's avatar Al Viro Committed by Chris Mason
Browse files

Fix btrfs when ACLs are configured out 



... otherwise generic_permission() will allow *anything* for all
files you don't own and that have some group permissions.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 524724ed

fs/btrfs/acl.c

+0 −5
Original line number Diff line number Diff line
@@ -351,9 +351,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir) 
	return 0;

}



int btrfs_check_acl(struct inode *inode, int mask)

{

	return 0;

}



#endif /* CONFIG_FS_POSIX_ACL */

fs/btrfs/ctree.h

+4 −0
Original line number Diff line number Diff line
@@ -2301,7 +2301,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options); 
int btrfs_sync_fs(struct super_block *sb, int wait);



/* acl.c */

#ifdef CONFIG_FS_POSIX_ACL

int btrfs_check_acl(struct inode *inode, int mask);

#else

#define btrfs_check_acl NULL

#endif

int btrfs_init_acl(struct inode *inode, struct inode *dir);

int btrfs_acl_chmod(struct inode *inode);