lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus

Browse Source
This commit is contained in:
Chris Mason
2009-10-01 12:58:13 -04:00
parent 17d857be64 ab93dbecfb
commit 25472b880c
14 changed files with 731 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/super.c
View File

@ -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);