diff options
| author | Christoph Hellwig <hch@lst.de> | 2008-06-10 10:40:29 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:03 -0400 |
| commit | edf24abe51493ccda384644d487fe2f796ac21c8 (patch) | |
| tree | 91244ac3bb85fd08c22f109011cc4a625037677f /fs/btrfs/disk-io.c | |
| parent | 306929f364b993581c91596230807fa1c022268a (diff) | |
| download | op-kernel-dev-edf24abe51493ccda384644d487fe2f796ac21c8.zip op-kernel-dev-edf24abe51493ccda384644d487fe2f796ac21c8.tar.gz | |
btrfs: sanity mount option parsing and early mount code
Also adds lots of comments to describe what's going on here.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 3805e7e..b9a5364 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1266,8 +1266,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, if (!btrfs_super_root(disk_super)) goto fail_sb_buffer; - btrfs_parse_options(options, tree_root, NULL); + err = btrfs_parse_options(tree_root, options); + if (err) + goto fail_sb_buffer; + err = -EINVAL; if (btrfs_super_num_devices(disk_super) > fs_devices->open_devices) { printk("Btrfs: wanted %llu devices, but found %llu\n", (unsigned long long)btrfs_super_num_devices(disk_super), |
