Skip to content

Commit

Permalink
Btrfs: compile when posix acl's are disabled
Browse files Browse the repository at this point in the history
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: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Josef Bacik authored and Chris Mason committed Sep 25, 2008
1 parent 639cb58 commit eab922e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
3 changes: 1 addition & 2 deletions fs/btrfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions fs/btrfs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 */

0 comments on commit eab922e

Please sign in to comment.