diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
| commit | 945d8962ceee6bb273365d0bdf42f763225b290f (patch) | |
| tree | 43f5617022c7c947c3c63664e49eb9575ab82f2f /fs/btrfs/super.c | |
| parent | 0d0ca30f180906224be6279788f2b202cfd959d8 (diff) | |
| parent | 4ea028859bbdad34b84c9951fbb832ae10c6a96c (diff) | |
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
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 cc5a2a8a5ac..fb72e2bea88 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -740,7 +740,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; @@ -763,7 +763,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; |