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

Fix btrfs_fill_super to return -EINVAL when no FS found

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan
2008-04-01 11:21:34 -04:00
committed by Chris Mason
parent 63b10fc487
commit e58ca0203d
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/disk-io.c
View File

@@ -728,9 +728,8 @@ struct btrfs_root *open_ctree(struct super_block *sb,
struct btrfs_root *dev_root = kmalloc(sizeof(struct btrfs_root), struct btrfs_root *dev_root = kmalloc(sizeof(struct btrfs_root),
GFP_NOFS); GFP_NOFS);
int ret; int ret;
int err = -EIO; int err = -EINVAL;
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;
if (!extent_root || !tree_root || !fs_info) { if (!extent_root || !tree_root || !fs_info) {
err = -ENOMEM; err = -ENOMEM;
goto fail; goto fail;

4
fs/btrfs/super.c
View File

@@ -236,9 +236,9 @@ static int btrfs_fill_super(struct super_block * sb,
tree_root = open_ctree(sb, fs_devices); tree_root = open_ctree(sb, fs_devices);
if (!tree_root || IS_ERR(tree_root)) { if (IS_ERR(tree_root)) {
printk("btrfs: open_ctree failed\n"); printk("btrfs: open_ctree failed\n");
return -EIO; return PTR_ERR(tree_root);
} }
sb->s_fs_info = tree_root; sb->s_fs_info = tree_root;
disk_super = &tree_root->fs_info->super_copy; disk_super = &tree_root->fs_info->super_copy;

2
fs/btrfs/volumes.c
View File

@@ -237,7 +237,7 @@ int btrfs_scan_one_device(const char *path, int flags, void *holder,
if (strncmp((char *)(&disk_super->magic), BTRFS_MAGIC, if (strncmp((char *)(&disk_super->magic), BTRFS_MAGIC,
sizeof(disk_super->magic))) { sizeof(disk_super->magic))) {
printk("no btrfs found on %s\n", path); printk("no btrfs found on %s\n", path);
ret = -ENOENT; ret = -EINVAL;
goto error_brelse; goto error_brelse;
} }
devid = le64_to_cpu(disk_super->dev_item.devid); devid = le64_to_cpu(disk_super->dev_item.devid);