diff options
| author | David Sterba <dsterba@suse.cz> | 2011-04-19 14:29:38 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-05-02 13:57:19 +0200 |
| commit | 306e16ce13c0f3d4fc071b45803b5b83c2606011 (patch) | |
| tree | 109aa42ae17d91429d11ab332e0c16e790f95dc5 /fs/btrfs/super.c | |
| parent | Merge branch 'fixes-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-306e16ce13c0f3d4fc071b45803b5b83c2606011.tar.xz linux-306e16ce13c0f3d4fc071b45803b5b83c2606011.zip | |
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) * for multiple device setup. Make sure to keep it in sync. */ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, - const char *dev_name, void *data) + const char *device_name, void *data) { struct block_device *bdev = NULL; struct super_block *s; @@ -762,7 +762,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, if (error) return ERR_PTR(error); - error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices); + error = btrfs_scan_one_device(device_name, mode, fs_type, &fs_devices); if (error) goto error_free_subvol_name; |