diff options
author | David Sterba <dsterba@suse.cz> | 2011-04-19 08:29:38 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-05-02 07:57:19 -0400 |
commit | 306e16ce13c0f3d4fc071b45803b5b83c2606011 (patch) | |
tree | 109aa42ae17d91429d11ab332e0c16e790f95dc5 /fs/btrfs/super.c | |
parent | 3fd9952df4964fac7d5868ba48eadcc9dae3ba46 (diff) |
btrfs: rename variables clashing with global function names
reported by gcc -Wshadow:
page_index, page_offset, new_inode, dev_name
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 0ac712efcdf2..3e28521643fb 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -739,7 +739,7 @@ static int btrfs_set_super(struct super_block *s, void *data) | |||
739 | * for multiple device setup. Make sure to keep it in sync. | 739 | * for multiple device setup. Make sure to keep it in sync. |
740 | */ | 740 | */ |
741 | static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, | 741 | static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, |
742 | const char *dev_name, void *data) | 742 | const char *device_name, void *data) |
743 | { | 743 | { |
744 | struct block_device *bdev = NULL; | 744 | struct block_device *bdev = NULL; |
745 | struct super_block *s; | 745 | struct super_block *s; |
@@ -762,7 +762,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, | |||
762 | if (error) | 762 | if (error) |
763 | return ERR_PTR(error); | 763 | return ERR_PTR(error); |
764 | 764 | ||
765 | error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices); | 765 | error = btrfs_scan_one_device(device_name, mode, fs_type, &fs_devices); |
766 | if (error) | 766 | if (error) |
767 | goto error_free_subvol_name; | 767 | goto error_free_subvol_name; |
768 | 768 | ||