diff options
| author | Chris Mason | 2009-10-01 18:58:13 +0200 |
|---|---|---|
| committer | Chris Mason | 2009-10-01 18:58:13 +0200 |
| commit | 25472b880c69c0daa485c4f80a6550437ed1149f (patch) | |
| tree | d12bc091e8991513db0d2891111ba773eb5c52e2 /fs/btrfs/super.c | |
| parent | Linux 2.6.32-rc1 (diff) | |
| parent | Btrfs: take i_mutex before generic_write_checks (diff) | |
| download | kernel-qcow2-linux-25472b880c69c0daa485c4f80a6550437ed1149f.tar.gz kernel-qcow2-linux-25472b880c69c0daa485c4f80a6550437ed1149f.tar.xz kernel-qcow2-linux-25472b880c69c0daa485c4f80a6550437ed1149f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 67035385444c..9de9b2236419 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -344,7 +344,9 @@ static int btrfs_fill_super(struct super_block *sb, sb->s_export_op = &btrfs_export_ops; sb->s_xattr = btrfs_xattr_handlers; sb->s_time_gran = 1; +#ifdef CONFIG_BTRFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; +#endif tree_root = open_ctree(sb, fs_devices, (char *)data); |