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

Commit eab922ec authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: compile when posix acl's are disabled 



This patch makes btrfs so it will compile properly when acls are disabled.  I
tested this and it worked with CONFIG_FS_POSIX_ACL off and on.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 639cb586

fs/btrfs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   transaction.o bit-radix.o inode.o file.o tree-defrag.o \

	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \

	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

	   ref-cache.o export.o

	   ref-cache.o acl.o export.o



btrfs-$(CONFIG_FS_POSIX_ACL)	+= acl.o

else



# Normal Makefile

fs/btrfs/acl.c

+21 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include "btrfs_inode.h"

#include "xattr.h"



#ifdef CONFIG_FS_POSIX_ACL



static void btrfs_update_cached_acl(struct inode *inode,

				    struct posix_acl **p_acl,

				    struct posix_acl *acl)
@@ -329,3 +331,22 @@ struct xattr_handler btrfs_xattr_acl_access_handler = { 
	.get	= btrfs_xattr_acl_access_get,

	.set	= btrfs_xattr_acl_access_set,

};



#else /* CONFIG_FS_POSIX_ACL */



int btrfs_acl_chmod(struct inode *inode)

{

	return 0;

}



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 */