diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-10-29 15:14:37 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2010-10-29 15:14:37 -0400 |
commit | 559af8211433b8c0b20e6c43c61409cb9c9c2996 (patch) | |
tree | 702ebd4c4f5b610daa36f65d814a518356a9a46b /fs/btrfs/super.c | |
parent | 411fc6bcef54f828a5458f4730c68abdf13c6bf0 (diff) |
Btrfs: cleanup warnings from gcc 4.6 (nonbugs)
These are all the cases where a variable is set, but not read which are
not bugs as far as I can see, but simply leftovers.
Still needs more review.
Found by gcc 4.6's new warnings
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d7fb2733d028..0002e6d1a16f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -61,6 +61,8 @@ static void btrfs_put_super(struct super_block *sb) | |||
61 | 61 | ||
62 | ret = close_ctree(root); | 62 | ret = close_ctree(root); |
63 | sb->s_fs_info = NULL; | 63 | sb->s_fs_info = NULL; |
64 | |||
65 | (void)ret; /* FIXME: need to fix VFS to return error? */ | ||
64 | } | 66 | } |
65 | 67 | ||
66 | enum { | 68 | enum { |
@@ -445,7 +447,6 @@ static int btrfs_fill_super(struct super_block *sb, | |||
445 | { | 447 | { |
446 | struct inode *inode; | 448 | struct inode *inode; |
447 | struct dentry *root_dentry; | 449 | struct dentry *root_dentry; |
448 | struct btrfs_super_block *disk_super; | ||
449 | struct btrfs_root *tree_root; | 450 | struct btrfs_root *tree_root; |
450 | struct btrfs_key key; | 451 | struct btrfs_key key; |
451 | int err; | 452 | int err; |
@@ -467,7 +468,6 @@ static int btrfs_fill_super(struct super_block *sb, | |||
467 | return PTR_ERR(tree_root); | 468 | return PTR_ERR(tree_root); |
468 | } | 469 | } |
469 | sb->s_fs_info = tree_root; | 470 | sb->s_fs_info = tree_root; |
470 | disk_super = &tree_root->fs_info->super_copy; | ||
471 | 471 | ||
472 | key.objectid = BTRFS_FIRST_FREE_OBJECTID; | 472 | key.objectid = BTRFS_FIRST_FREE_OBJECTID; |
473 | key.type = BTRFS_INODE_ITEM_KEY; | 473 | key.type = BTRFS_INODE_ITEM_KEY; |
@@ -580,7 +580,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, | |||
580 | char *subvol_name = NULL; | 580 | char *subvol_name = NULL; |
581 | u64 subvol_objectid = 0; | 581 | u64 subvol_objectid = 0; |
582 | int error = 0; | 582 | int error = 0; |
583 | int found = 0; | ||
584 | 583 | ||
585 | if (!(flags & MS_RDONLY)) | 584 | if (!(flags & MS_RDONLY)) |
586 | mode |= FMODE_WRITE; | 585 | mode |= FMODE_WRITE; |
@@ -616,7 +615,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags, | |||
616 | goto error_close_devices; | 615 | goto error_close_devices; |
617 | } | 616 | } |
618 | 617 | ||
619 | found = 1; | ||
620 | btrfs_close_devices(fs_devices); | 618 | btrfs_close_devices(fs_devices); |
621 | } else { | 619 | } else { |
622 | char b[BDEVNAME_SIZE]; | 620 | char b[BDEVNAME_SIZE]; |