UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ubifs: Convert to separately allocated bdi 

Allocate struct backing_dev_info separately instead of embedding it
inside the superblock. This unifies handling of bdi among users.

CC: Richard Weinberger <richard@nod.at>
CC: Artem Bityutskiy <dedekind1@gmail.com>
CC: Adrian Hunter <adrian.hunter@intel.com>
CC: linux-mtd@lists.infradead.org
Acked-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jan Kara 2017-04-12 12:24:46 +02:00 committed by Jens Axboe
parent 0db10944a7
commit 99edd4580b
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/ubifs/super.c
View File

@ -1827,7 +1827,6 @@ static void ubifs_put_super(struct super_block *sb)
} }
ubifs_umount(c); ubifs_umount(c);
bdi_destroy(&c->bdi);
ubi_close_volume(c->ubi); ubi_close_volume(c->ubi);
mutex_unlock(&c->umount_mutex); mutex_unlock(&c->umount_mutex);
} }
@ -2019,29 +2018,25 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
goto out; goto out;
} }
err = ubifs_parse_options(c, data, 0);
if (err)
goto out_close;
/* /*
* UBIFS provides 'backing_dev_info' in order to disable read-ahead. For * UBIFS provides 'backing_dev_info' in order to disable read-ahead. For
* UBIFS, I/O is not deferred, it is done immediately in readpage, * UBIFS, I/O is not deferred, it is done immediately in readpage,
* which means the user would have to wait not just for their own I/O * which means the user would have to wait not just for their own I/O
* but the read-ahead I/O as well i.e. completely pointless. * but the read-ahead I/O as well i.e. completely pointless.
* *
* Read-ahead will be disabled because @c->bdi.ra_pages is 0. * Read-ahead will be disabled because @sb->s_bdi->ra_pages is 0. Also
* @sb->s_bdi->capabilities are initialized to 0 so there won't be any
* writeback happening.
*/ */
c->bdi.name = "ubifs", err = super_setup_bdi_name(sb, "ubifs_%d_%d", c->vi.ubi_num,
c->bdi.capabilities = 0; c->vi.vol_id);
err = bdi_init(&c->bdi);
if (err) if (err)
goto out_close; goto out_close;
err = bdi_register(&c->bdi, NULL, "ubifs_%d_%d",
c->vi.ubi_num, c->vi.vol_id);
if (err)
goto out_bdi;
err = ubifs_parse_options(c, data, 0);
if (err)
goto out_bdi;
sb->s_bdi = &c->bdi;
sb->s_fs_info = c; sb->s_fs_info = c;
sb->s_magic = UBIFS_SUPER_MAGIC; sb->s_magic = UBIFS_SUPER_MAGIC;
sb->s_blocksize = UBIFS_BLOCK_SIZE; sb->s_blocksize = UBIFS_BLOCK_SIZE;
@ -2080,8 +2075,6 @@ out_umount:
ubifs_umount(c); ubifs_umount(c);
out_unlock: out_unlock:
mutex_unlock(&c->umount_mutex); mutex_unlock(&c->umount_mutex);
out_bdi:
bdi_destroy(&c->bdi);
out_close: out_close:
ubi_close_volume(c->ubi); ubi_close_volume(c->ubi);
out: out:

3
fs/ubifs/ubifs.h
View File

@ -972,7 +972,6 @@ struct ubifs_debug_info;
* struct ubifs_info - UBIFS file-system description data structure * struct ubifs_info - UBIFS file-system description data structure
* (per-superblock). * (per-superblock).
* @vfs_sb: VFS @struct super_block object * @vfs_sb: VFS @struct super_block object
* @bdi: backing device info object to make VFS happy and disable read-ahead
* *
* @highest_inum: highest used inode number * @highest_inum: highest used inode number
* @max_sqnum: current global sequence number * @max_sqnum: current global sequence number
@ -1220,7 +1219,6 @@ struct ubifs_debug_info;
*/ */
struct ubifs_info { struct ubifs_info {
struct super_block *vfs_sb; struct super_block *vfs_sb;
struct backing_dev_info bdi;
ino_t highest_inum; ino_t highest_inum;
unsigned long long max_sqnum; unsigned long long max_sqnum;
@ -1461,7 +1459,6 @@ extern const struct inode_operations ubifs_file_inode_operations;
extern const struct file_operations ubifs_dir_operations; extern const struct file_operations ubifs_dir_operations;
extern const struct inode_operations ubifs_dir_inode_operations; extern const struct inode_operations ubifs_dir_inode_operations;
extern const struct inode_operations ubifs_symlink_inode_operations; extern const struct inode_operations ubifs_symlink_inode_operations;
extern struct backing_dev_info ubifs_backing_dev_info;
extern struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; extern struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
/* io.c */ /* io.c */