Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e89c86 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: use iget for all metadata files 



This makes use of iget5_locked to allocate or get inode for metadata
files to stop using own inode allocator.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent c1c1d709

fs/nilfs2/cpfile.c

+31 −18
Original line number Diff line number Diff line
@@ -933,27 +933,40 @@ int nilfs_cpfile_get_stat(struct inode *cpfile, struct nilfs_cpstat *cpstat) 
}



/**

 * nilfs_cpfile_read - read cpfile inode

 * @cpfile: cpfile inode

 * @raw_inode: on-disk cpfile inode

 */

int nilfs_cpfile_read(struct inode *cpfile, struct nilfs_inode *raw_inode)

{

	return nilfs_read_inode_common(cpfile, raw_inode);

}



/**

 * nilfs_cpfile_new - create cpfile

 * @nilfs: nilfs object

 * nilfs_cpfile_read - read or get cpfile inode

 * @sb: super block instance

 * @cpsize: size of a checkpoint entry

 * @raw_inode: on-disk cpfile inode

 * @inodep: buffer to store the inode

 */

struct inode *nilfs_cpfile_new(struct the_nilfs *nilfs, size_t cpsize)

int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,

		      struct nilfs_inode *raw_inode, struct inode **inodep)

{

	struct inode *cpfile;

	int err;



	cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);

	if (unlikely(!cpfile))

		return -ENOMEM;

	if (!(cpfile->i_state & I_NEW))

		goto out;



	err = nilfs_mdt_init(cpfile, NILFS_MDT_GFP, 0);

	if (err)

		goto failed;



	cpfile = nilfs_mdt_new(nilfs, NULL, NILFS_CPFILE_INO, 0);

	if (cpfile)

	nilfs_mdt_set_entry_size(cpfile, cpsize,

				 sizeof(struct nilfs_cpfile_header));

	return cpfile;



	err = nilfs_read_inode_common(cpfile, raw_inode);

	if (err)

		goto failed;



	unlock_new_inode(cpfile);

 out:

	*inodep = cpfile;

	return 0;

 failed:

	iget_failed(cpfile);

	return err;

}

fs/nilfs2/cpfile.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ int nilfs_cpfile_get_stat(struct inode *, struct nilfs_cpstat *); 
ssize_t nilfs_cpfile_get_cpinfo(struct inode *, __u64 *, int, void *, unsigned,

				size_t);



int nilfs_cpfile_read(struct inode *cpfile, struct nilfs_inode *raw_inode);

struct inode *nilfs_cpfile_new(struct the_nilfs *nilfs, size_t cpsize);

int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,

		      struct nilfs_inode *raw_inode, struct inode **inodep);



#endif	/* _NILFS_CPFILE_H */

fs/nilfs2/dat.c

+35 −26
Original line number Diff line number Diff line
@@ -463,39 +463,48 @@ ssize_t nilfs_dat_get_vinfo(struct inode *dat, void *buf, unsigned visz, 
}



/**

 * nilfs_dat_read - read dat inode

 * @dat: dat inode

 * @raw_inode: on-disk dat inode

 */

int nilfs_dat_read(struct inode *dat, struct nilfs_inode *raw_inode)

{

	return nilfs_read_inode_common(dat, raw_inode);

}



/**

 * nilfs_dat_new - create dat file

 * @nilfs: nilfs object

 * nilfs_dat_read - read or get dat inode

 * @sb: super block instance

 * @entry_size: size of a dat entry

 * @raw_inode: on-disk dat inode

 * @inodep: buffer to store the inode

 */

struct inode *nilfs_dat_new(struct the_nilfs *nilfs, size_t entry_size)

int nilfs_dat_read(struct super_block *sb, size_t entry_size,

		   struct nilfs_inode *raw_inode, struct inode **inodep)

{

	static struct lock_class_key dat_lock_key;

	struct inode *dat;

	struct nilfs_dat_info *di;

	int err;



	dat = nilfs_mdt_new(nilfs, NULL, NILFS_DAT_INO, sizeof(*di));

	if (dat) {

	dat = nilfs_iget_locked(sb, NULL, NILFS_DAT_INO);

	if (unlikely(!dat))

		return -ENOMEM;

	if (!(dat->i_state & I_NEW))

		goto out;



	err = nilfs_mdt_init(dat, NILFS_MDT_GFP, sizeof(*di));

	if (err)

		goto failed;



	err = nilfs_palloc_init_blockgroup(dat, entry_size);

		if (unlikely(err)) {

			nilfs_mdt_destroy(dat);

			return NULL;

		}

	if (err)

		goto failed;



	di = NILFS_DAT_I(dat);

	lockdep_set_class(&di->mi.mi_sem, &dat_lock_key);

	nilfs_palloc_setup_cache(dat, &di->palloc_cache);

	nilfs_mdt_setup_shadow_map(dat, &di->shadow);

	}

	return dat;



	err = nilfs_read_inode_common(dat, raw_inode);

	if (err)

		goto failed;



	unlock_new_inode(dat);

 out:

	*inodep = dat;

	return 0;

 failed:

	iget_failed(dat);

	return err;

}

fs/nilfs2/dat.h

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int nilfs_dat_freev(struct inode *, __u64 *, size_t); 
int nilfs_dat_move(struct inode *, __u64, sector_t);

ssize_t nilfs_dat_get_vinfo(struct inode *, void *, unsigned, size_t);



int nilfs_dat_read(struct inode *dat, struct nilfs_inode *raw_inode);

struct inode *nilfs_dat_new(struct the_nilfs *nilfs, size_t entry_size);

int nilfs_dat_read(struct super_block *sb, size_t entry_size,

		   struct nilfs_inode *raw_inode, struct inode **inodep);



#endif	/* _NILFS_DAT_H */

fs/nilfs2/ifile.c

+36 −15
Original line number Diff line number Diff line
@@ -161,25 +161,46 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino, 
}



/**

 * nilfs_ifile_new - create inode file

 * @sbi: nilfs_sb_info struct

 * nilfs_ifile_read - read or get ifile inode

 * @sb: super block instance

 * @root: root object

 * @inode_size: size of an inode

 * @raw_inode: on-disk ifile inode

 * @inodep: buffer to store the inode

 */

struct inode *nilfs_ifile_new(struct nilfs_sb_info *sbi, size_t inode_size)

int nilfs_ifile_read(struct super_block *sb, struct nilfs_root *root,

		     size_t inode_size, struct nilfs_inode *raw_inode,

		     struct inode **inodep)

{

	struct inode *ifile;

	int err;



	ifile = nilfs_mdt_new(sbi->s_nilfs, sbi->s_super, NILFS_IFILE_INO,

	ifile = nilfs_iget_locked(sb, root, NILFS_IFILE_INO);

	if (unlikely(!ifile))

		return -ENOMEM;

	if (!(ifile->i_state & I_NEW))

		goto out;



	err = nilfs_mdt_init(ifile, NILFS_MDT_GFP,

			     sizeof(struct nilfs_ifile_info));

	if (ifile) {

	if (err)

		goto failed;



	err = nilfs_palloc_init_blockgroup(ifile, inode_size);

		if (unlikely(err)) {

			nilfs_mdt_destroy(ifile);

			return NULL;

		}

		nilfs_palloc_setup_cache(ifile,

					 &NILFS_IFILE_I(ifile)->palloc_cache);

	}

	return ifile;

	if (err)

		goto failed;



	nilfs_palloc_setup_cache(ifile, &NILFS_IFILE_I(ifile)->palloc_cache);



	err = nilfs_read_inode_common(ifile, raw_inode);

	if (err)

		goto failed;



	unlock_new_inode(ifile);

 out:

	*inodep = ifile;

	return 0;

 failed:

	iget_failed(ifile);

	return err;

}