diff options
author | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
commit | 2340c679cabc5477598ee3c9c2044ec8893d42fd (patch) | |
tree | 2cf2848bea005b9d807710f23dc5519191ca8215 /fs/btrfs/ctree.h | |
parent | 9a489d92af45a7d7c1bba9e0803f73f95d2fd13c (diff) | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
download | kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.zip kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.gz kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.bz2 |
Merge commit 'v3.0-rc7' into linux-omap-3.0
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index f30ac05..3b859a3 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1335,6 +1335,11 @@ struct btrfs_ioctl_defrag_range_args { */ #define BTRFS_STRING_ITEM_KEY 253 +/* + * Flags for mount options. + * + * Note: don't forget to add new options to btrfs_show_options() + */ #define BTRFS_MOUNT_NODATASUM (1 << 0) #define BTRFS_MOUNT_NODATACOW (1 << 1) #define BTRFS_MOUNT_NOBARRIER (1 << 2) |