diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-09-15 03:43:56 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-09-16 09:16:18 -0400 |
commit | 2c96ce9f2084c1e04d02883e622f74a537a63aea (patch) | |
tree | cad3c6773d2886103b05f7b090b3385d23076a03 /fs | |
parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) |
fs: remove bdev->bd_inode_backing_dev_info
It has been unused since it was introduced in:
commit 520808bf20e90fdbdb320264ba7dd5cf9d47dcac
Author: Andrew Morton <akpm@osdl.org>
Date: Fri May 21 00:46:17 2004 -0700
[PATCH] block device layer: separate backing_dev_info infrastructure
So lets just kill it.
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/block_dev.c | 1 | ||||
-rw-r--r-- | fs/inode.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/the_nilfs.c | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 3581a4e53942..71e7e03ac343 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -420,7 +420,6 @@ static void bdev_destroy_inode(struct inode *inode) | |||
420 | { | 420 | { |
421 | struct bdev_inode *bdi = BDEV_I(inode); | 421 | struct bdev_inode *bdi = BDEV_I(inode); |
422 | 422 | ||
423 | bdi->bdev.bd_inode_backing_dev_info = NULL; | ||
424 | kmem_cache_free(bdev_cachep, bdi); | 423 | kmem_cache_free(bdev_cachep, bdi); |
425 | } | 424 | } |
426 | 425 | ||
diff --git a/fs/inode.c b/fs/inode.c index ae7b67e48661..b2ba83d2c4e1 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -182,9 +182,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) | |||
182 | if (sb->s_bdev) { | 182 | if (sb->s_bdev) { |
183 | struct backing_dev_info *bdi; | 183 | struct backing_dev_info *bdi; |
184 | 184 | ||
185 | bdi = sb->s_bdev->bd_inode_backing_dev_info; | 185 | bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; |
186 | if (!bdi) | ||
187 | bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; | ||
188 | mapping->backing_dev_info = bdi; | 186 | mapping->backing_dev_info = bdi; |
189 | } | 187 | } |
190 | inode->i_private = NULL; | 188 | inode->i_private = NULL; |
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index d4168e269c5d..ad391a8c3e7e 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -591,9 +591,7 @@ int init_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi, char *data) | |||
591 | 591 | ||
592 | nilfs->ns_mount_state = le16_to_cpu(sbp->s_state); | 592 | nilfs->ns_mount_state = le16_to_cpu(sbp->s_state); |
593 | 593 | ||
594 | bdi = nilfs->ns_bdev->bd_inode_backing_dev_info; | 594 | bdi = nilfs->ns_bdev->bd_inode->i_mapping->backing_dev_info; |
595 | if (!bdi) | ||
596 | bdi = nilfs->ns_bdev->bd_inode->i_mapping->backing_dev_info; | ||
597 | nilfs->ns_bdi = bdi ? : &default_backing_dev_info; | 595 | nilfs->ns_bdi = bdi ? : &default_backing_dev_info; |
598 | 596 | ||
599 | /* Finding last segment */ | 597 | /* Finding last segment */ |