Skip to content

Commit b83ae6d

Browse files
Christoph Hellwigaxboe
authored andcommitted
fs: remove mapping->backing_dev_info
Now that we never use the backing_dev_info pointer in struct address_space we can simply remove it and save 4 to 8 bytes in every inode. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Ryusuke Konishi <[email protected]> Reviewed-by: Tejun Heo <[email protected]> Reviewed-by: Jan Kara <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent de1414a commit b83ae6d

File tree

32 files changed

+8
-91
lines changed

32 files changed

+8
-91
lines changed

drivers/char/raw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,9 @@ static int raw_release(struct inode *inode, struct file *filp)
104104

105105
mutex_lock(&raw_mutex);
106106
bdev = raw_devices[minor].binding;
107-
if (--raw_devices[minor].inuse == 0) {
107+
if (--raw_devices[minor].inuse == 0)
108108
/* Here inode->i_mapping == bdev->bd_inode->i_mapping */
109109
inode->i_mapping = &inode->i_data;
110-
inode->i_mapping->backing_dev_info = &default_backing_dev_info;
111-
}
112110
mutex_unlock(&raw_mutex);
113111

114112
blkdev_put(bdev, filp->f_mode | FMODE_EXCL);

fs/aio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages)
176176

177177
inode->i_mapping->a_ops = &aio_ctx_aops;
178178
inode->i_mapping->private_data = ctx;
179-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
180179
inode->i_size = PAGE_SIZE * nr_pages;
181180

182181
path.dentry = d_alloc_pseudo(aio_mnt->mnt_sb, &this);

fs/block_dev.c

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,6 @@ static void bdev_write_inode(struct inode *inode)
6060
spin_unlock(&inode->i_lock);
6161
}
6262

63-
/*
64-
* Move the inode from its current bdi to a new bdi. Make sure the inode
65-
* is clean before moving so that it doesn't linger on the old bdi.
66-
*/
67-
static void bdev_inode_switch_bdi(struct inode *inode,
68-
struct backing_dev_info *dst)
69-
{
70-
spin_lock(&inode->i_lock);
71-
WARN_ON_ONCE(inode->i_state & I_DIRTY);
72-
inode->i_data.backing_dev_info = dst;
73-
spin_unlock(&inode->i_lock);
74-
}
75-
7663
/* Kill _all_ buffers and pagecache , dirty or not.. */
7764
void kill_bdev(struct block_device *bdev)
7865
{
@@ -589,7 +576,6 @@ struct block_device *bdget(dev_t dev)
589576
inode->i_bdev = bdev;
590577
inode->i_data.a_ops = &def_blk_aops;
591578
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
592-
inode->i_data.backing_dev_info = &default_backing_dev_info;
593579
spin_lock(&bdev_lock);
594580
list_add(&bdev->bd_list, &all_bdevs);
595581
spin_unlock(&bdev_lock);
@@ -1150,8 +1136,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
11501136
bdev->bd_queue = disk->queue;
11511137
bdev->bd_contains = bdev;
11521138
if (!partno) {
1153-
struct backing_dev_info *bdi;
1154-
11551139
ret = -ENXIO;
11561140
bdev->bd_part = disk_get_part(disk, partno);
11571141
if (!bdev->bd_part)
@@ -1177,11 +1161,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
11771161
}
11781162
}
11791163

1180-
if (!ret) {
1164+
if (!ret)
11811165
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
1182-
bdi = blk_get_backing_dev_info(bdev);
1183-
bdev_inode_switch_bdi(bdev->bd_inode, bdi);
1184-
}
11851166

11861167
/*
11871168
* If the device is invalidated, rescan partition
@@ -1208,8 +1189,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
12081189
if (ret)
12091190
goto out_clear;
12101191
bdev->bd_contains = whole;
1211-
bdev_inode_switch_bdi(bdev->bd_inode,
1212-
whole->bd_inode->i_data.backing_dev_info);
12131192
bdev->bd_part = disk_get_part(disk, partno);
12141193
if (!(disk->flags & GENHD_FL_UP) ||
12151194
!bdev->bd_part || !bdev->bd_part->nr_sects) {
@@ -1249,7 +1228,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
12491228
bdev->bd_disk = NULL;
12501229
bdev->bd_part = NULL;
12511230
bdev->bd_queue = NULL;
1252-
bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);
12531231
if (bdev != bdev->bd_contains)
12541232
__blkdev_put(bdev->bd_contains, mode, 1);
12551233
bdev->bd_contains = NULL;
@@ -1474,8 +1452,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
14741452
* dirty data before.
14751453
*/
14761454
bdev_write_inode(bdev->bd_inode);
1477-
bdev_inode_switch_bdi(bdev->bd_inode,
1478-
&default_backing_dev_info);
14791455
}
14801456
if (bdev->bd_contains == bdev) {
14811457
if (disk->fops->release)

fs/btrfs/disk-io.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,6 @@ int open_ctree(struct super_block *sb,
23182318
*/
23192319
fs_info->btree_inode->i_size = OFFSET_MAX;
23202320
fs_info->btree_inode->i_mapping->a_ops = &btree_aops;
2321-
fs_info->btree_inode->i_mapping->backing_dev_info = &fs_info->bdi;
23222321

23232322
RB_CLEAR_NODE(&BTRFS_I(fs_info->btree_inode)->rb_node);
23242323
extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree,

fs/btrfs/inode.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3608,7 +3608,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
36083608
switch (inode->i_mode & S_IFMT) {
36093609
case S_IFREG:
36103610
inode->i_mapping->a_ops = &btrfs_aops;
3611-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
36123611
BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
36133612
inode->i_fop = &btrfs_file_operations;
36143613
inode->i_op = &btrfs_file_inode_operations;
@@ -3623,7 +3622,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
36233622
case S_IFLNK:
36243623
inode->i_op = &btrfs_symlink_inode_operations;
36253624
inode->i_mapping->a_ops = &btrfs_symlink_aops;
3626-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
36273625
break;
36283626
default:
36293627
inode->i_op = &btrfs_special_inode_operations;
@@ -6088,7 +6086,6 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
60886086
inode->i_fop = &btrfs_file_operations;
60896087
inode->i_op = &btrfs_file_inode_operations;
60906088
inode->i_mapping->a_ops = &btrfs_aops;
6091-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
60926089

60936090
err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
60946091
if (err)
@@ -9203,7 +9200,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
92039200
inode->i_fop = &btrfs_file_operations;
92049201
inode->i_op = &btrfs_file_inode_operations;
92059202
inode->i_mapping->a_ops = &btrfs_aops;
9206-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
92079203
BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
92089204

92099205
err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
@@ -9247,7 +9243,6 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
92479243

92489244
inode->i_op = &btrfs_symlink_inode_operations;
92499245
inode->i_mapping->a_ops = &btrfs_symlink_aops;
9250-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
92519246
inode_set_bytes(inode, name_len);
92529247
btrfs_i_size_write(inode, name_len);
92539248
err = btrfs_update_inode(trans, root, inode);
@@ -9459,7 +9454,6 @@ static int btrfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
94599454
inode->i_op = &btrfs_file_inode_operations;
94609455

94619456
inode->i_mapping->a_ops = &btrfs_aops;
9462-
inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
94639457
BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
94649458

94659459
ret = btrfs_init_inode_security(trans, inode, dir, NULL);

fs/ceph/inode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,6 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
783783
}
784784

785785
inode->i_mapping->a_ops = &ceph_aops;
786-
inode->i_mapping->backing_dev_info =
787-
&ceph_sb_to_client(inode->i_sb)->backing_dev_info;
788786

789787
switch (inode->i_mode & S_IFMT) {
790788
case S_IFIFO:

fs/cifs/inode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,8 +937,6 @@ cifs_iget(struct super_block *sb, struct cifs_fattr *fattr)
937937
inode->i_flags |= S_NOATIME | S_NOCMTIME;
938938
if (inode->i_state & I_NEW) {
939939
inode->i_ino = hash;
940-
if (S_ISREG(inode->i_mode))
941-
inode->i_data.backing_dev_info = sb->s_bdi;
942940
#ifdef CONFIG_CIFS_FSCACHE
943941
/* initialize per-inode cache cookie pointer */
944942
CIFS_I(inode)->fscache = NULL;

fs/configfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
131131
if (inode) {
132132
inode->i_ino = get_next_ino();
133133
inode->i_mapping->a_ops = &configfs_aops;
134-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
135134
inode->i_op = &configfs_inode_operations;
136135

137136
if (sd->s_iattr) {

fs/ecryptfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ static int ecryptfs_inode_set(struct inode *inode, void *opaque)
6767
inode->i_ino = lower_inode->i_ino;
6868
inode->i_version++;
6969
inode->i_mapping->a_ops = &ecryptfs_aops;
70-
inode->i_mapping->backing_dev_info = inode->i_sb->s_bdi;
7170

7271
if (S_ISLNK(inode->i_mode))
7372
inode->i_op = &ecryptfs_symlink_iops;

fs/exofs/inode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,6 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
12141214
memcpy(oi->i_data, fcb.i_data, sizeof(fcb.i_data));
12151215
}
12161216

1217-
inode->i_mapping->backing_dev_info = sb->s_bdi;
12181217
if (S_ISREG(inode->i_mode)) {
12191218
inode->i_op = &exofs_file_inode_operations;
12201219
inode->i_fop = &exofs_file_operations;
@@ -1314,7 +1313,6 @@ struct inode *exofs_new_inode(struct inode *dir, umode_t mode)
13141313

13151314
set_obj_2bcreated(oi);
13161315

1317-
inode->i_mapping->backing_dev_info = sb->s_bdi;
13181316
inode_init_owner(inode, dir, mode);
13191317
inode->i_ino = sbi->s_nextid++;
13201318
inode->i_blkbits = EXOFS_BLKSHIFT;

fs/fuse/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
308308
if (!fc->writeback_cache || !S_ISREG(attr->mode))
309309
inode->i_flags |= S_NOCMTIME;
310310
inode->i_generation = generation;
311-
inode->i_data.backing_dev_info = &fc->bdi;
312311
fuse_init_inode(inode, attr);
313312
unlock_new_inode(inode);
314313
} else if ((inode->i_mode ^ attr->mode) & S_IFMT) {

fs/gfs2/glock.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
775775
mapping->flags = 0;
776776
mapping_set_gfp_mask(mapping, GFP_NOFS);
777777
mapping->private_data = NULL;
778-
mapping->backing_dev_info = s->s_bdi;
779778
mapping->writeback_index = 0;
780779
}
781780

fs/gfs2/ops_fstype.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
112112
mapping->flags = 0;
113113
mapping_set_gfp_mask(mapping, GFP_NOFS);
114114
mapping->private_data = NULL;
115-
mapping->backing_dev_info = sb->s_bdi;
116115
mapping->writeback_index = 0;
117116

118117
spin_lock_init(&sdp->sd_log_lock);

fs/hugetlbfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,
492492
lockdep_set_class(&inode->i_mapping->i_mmap_rwsem,
493493
&hugetlbfs_i_mmap_rwsem_key);
494494
inode->i_mapping->a_ops = &hugetlbfs_aops;
495-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
496495
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
497496
inode->i_mapping->private_data = resv_map;
498497
info = HUGETLBFS_I(inode);

fs/inode.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
170170
atomic_set(&mapping->i_mmap_writable, 0);
171171
mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE);
172172
mapping->private_data = NULL;
173-
mapping->backing_dev_info = &default_backing_dev_info;
174173
mapping->writeback_index = 0;
175-
176-
/*
177-
* If the block_device provides a backing_dev_info for client
178-
* inodes then use that. Otherwise the inode share the bdev's
179-
* backing_dev_info.
180-
*/
181-
if (sb->s_bdev) {
182-
struct backing_dev_info *bdi;
183-
184-
bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info;
185-
mapping->backing_dev_info = bdi;
186-
}
187174
inode->i_private = NULL;
188175
inode->i_mapping = mapping;
189176
INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */

fs/kernfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ static void kernfs_init_inode(struct kernfs_node *kn, struct inode *inode)
286286
kernfs_get(kn);
287287
inode->i_private = kn;
288288
inode->i_mapping->a_ops = &kernfs_aops;
289-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
290289
inode->i_op = &kernfs_iops;
291290

292291
set_default_inode_attr(inode, kn->mode);

fs/ncpfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info)
267267
if (inode) {
268268
atomic_set(&NCP_FINFO(inode)->opened, info->opened);
269269

270-
inode->i_mapping->backing_dev_info = sb->s_bdi;
271270
inode->i_ino = info->ino;
272271
ncp_set_attr(inode, info);
273272
if (S_ISREG(inode->i_mode)) {

fs/nfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st
387387
if (S_ISREG(inode->i_mode)) {
388388
inode->i_fop = NFS_SB(sb)->nfs_client->rpc_ops->file_ops;
389389
inode->i_data.a_ops = &nfs_file_aops;
390-
inode->i_data.backing_dev_info = &NFS_SB(sb)->backing_dev_info;
391390
} else if (S_ISDIR(inode->i_mode)) {
392391
inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->dir_inode_ops;
393392
inode->i_fop = &nfs_dir_operations;

fs/nilfs2/gcinode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ int nilfs_init_gcinode(struct inode *inode)
172172
inode->i_mode = S_IFREG;
173173
mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);
174174
inode->i_mapping->a_ops = &empty_aops;
175-
inode->i_mapping->backing_dev_info = inode->i_sb->s_bdi;
176175

177176
ii->i_flags = 0;
178177
nilfs_bmap_init_gc(ii->i_bmap);

fs/nilfs2/mdt.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ int nilfs_mdt_init(struct inode *inode, gfp_t gfp_mask, size_t objsz)
429429

430430
inode->i_mode = S_IFREG;
431431
mapping_set_gfp_mask(inode->i_mapping, gfp_mask);
432-
inode->i_mapping->backing_dev_info = inode->i_sb->s_bdi;
433432

434433
inode->i_op = &def_mdt_iops;
435434
inode->i_fop = &def_mdt_fops;
@@ -457,13 +456,12 @@ int nilfs_mdt_setup_shadow_map(struct inode *inode,
457456
struct nilfs_shadow_map *shadow)
458457
{
459458
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
460-
struct backing_dev_info *bdi = inode->i_sb->s_bdi;
461459

462460
INIT_LIST_HEAD(&shadow->frozen_buffers);
463461
address_space_init_once(&shadow->frozen_data);
464-
nilfs_mapping_init(&shadow->frozen_data, inode, bdi);
462+
nilfs_mapping_init(&shadow->frozen_data, inode);
465463
address_space_init_once(&shadow->frozen_btnodes);
466-
nilfs_mapping_init(&shadow->frozen_btnodes, inode, bdi);
464+
nilfs_mapping_init(&shadow->frozen_btnodes, inode);
467465
mi->mi_shadow = shadow;
468466
return 0;
469467
}

fs/nilfs2/page.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,12 @@ unsigned nilfs_page_count_clean_buffers(struct page *page,
461461
return nc;
462462
}
463463

464-
void nilfs_mapping_init(struct address_space *mapping, struct inode *inode,
465-
struct backing_dev_info *bdi)
464+
void nilfs_mapping_init(struct address_space *mapping, struct inode *inode)
466465
{
467466
mapping->host = inode;
468467
mapping->flags = 0;
469468
mapping_set_gfp_mask(mapping, GFP_NOFS);
470469
mapping->private_data = NULL;
471-
mapping->backing_dev_info = bdi;
472470
mapping->a_ops = &empty_aops;
473471
}
474472

fs/nilfs2/page.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ int nilfs_copy_dirty_pages(struct address_space *, struct address_space *);
5757
void nilfs_copy_back_pages(struct address_space *, struct address_space *);
5858
void nilfs_clear_dirty_page(struct page *, bool);
5959
void nilfs_clear_dirty_pages(struct address_space *, bool);
60-
void nilfs_mapping_init(struct address_space *mapping, struct inode *inode,
61-
struct backing_dev_info *bdi);
60+
void nilfs_mapping_init(struct address_space *mapping, struct inode *inode);
6261
unsigned nilfs_page_count_clean_buffers(struct page *, unsigned, unsigned);
6362
unsigned long nilfs_find_uncommitted_extent(struct inode *inode,
6463
sector_t start_blk,

fs/nilfs2/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ struct inode *nilfs_alloc_inode(struct super_block *sb)
166166
ii->i_state = 0;
167167
ii->i_cno = 0;
168168
ii->vfs_inode.i_version = 1;
169-
nilfs_mapping_init(&ii->i_btnode_cache, &ii->vfs_inode, sb->s_bdi);
169+
nilfs_mapping_init(&ii->i_btnode_cache, &ii->vfs_inode);
170170
return &ii->vfs_inode;
171171
}
172172

fs/ocfs2/dlmfs/dlmfs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb)
398398
if (inode) {
399399
inode->i_ino = get_next_ino();
400400
inode_init_owner(inode, NULL, mode);
401-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
402401
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
403402
inc_nlink(inode);
404403

@@ -422,7 +421,6 @@ static struct inode *dlmfs_get_inode(struct inode *parent,
422421

423422
inode->i_ino = get_next_ino();
424423
inode_init_owner(inode, parent, mode);
425-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
426424
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
427425

428426
ip = DLMFS_I(inode);

fs/ramfs/inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ struct inode *ramfs_get_inode(struct super_block *sb,
5959
inode->i_ino = get_next_ino();
6060
inode_init_owner(inode, dir, mode);
6161
inode->i_mapping->a_ops = &ramfs_aops;
62-
inode->i_mapping->backing_dev_info = &noop_backing_dev_info;
6362
mapping_set_gfp_mask(inode->i_mapping, GFP_HIGHUSER);
6463
mapping_set_unevictable(inode->i_mapping);
6564
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

fs/romfs/super.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,6 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)
355355
case ROMFH_REG:
356356
i->i_fop = &romfs_ro_fops;
357357
i->i_data.a_ops = &romfs_aops;
358-
if (i->i_sb->s_mtd)
359-
i->i_data.backing_dev_info =
360-
i->i_sb->s_mtd->backing_dev_info;
361358
if (nextfh & ROMFH_EXEC)
362359
mode |= S_IXUGO;
363360
break;

fs/ubifs/dir.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
108108
inode->i_mtime = inode->i_atime = inode->i_ctime =
109109
ubifs_current_time(inode);
110110
inode->i_mapping->nrpages = 0;
111-
/* Disable readahead */
112-
inode->i_mapping->backing_dev_info = &c->bdi;
113111

114112
switch (mode & S_IFMT) {
115113
case S_IFREG:

fs/ubifs/super.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
156156
if (err)
157157
goto out_invalid;
158158

159-
/* Disable read-ahead */
160-
inode->i_mapping->backing_dev_info = &c->bdi;
161-
162159
switch (inode->i_mode & S_IFMT) {
163160
case S_IFREG:
164161
inode->i_mapping->a_ops = &ubifs_file_address_operations;

0 commit comments

Comments
 (0)