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

nilfs2: add local variable to cache the number of clean segments 



This makes it possible for sufile to get the number of clean segments
faster.

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

fs/nilfs2/sufile.c

+43 −10
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ 
#include "sufile.h"





struct nilfs_sufile_info {

	struct nilfs_mdt_info mi;

	unsigned long ncleansegs;

};



static inline struct nilfs_sufile_info *NILFS_SUI(struct inode *sufile)

{

	return (struct nilfs_sufile_info *)NILFS_MDT(sufile);

}



static inline unsigned long

nilfs_sufile_segment_usages_per_block(const struct inode *sufile)

{
@@ -300,6 +310,7 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump) 
			header->sh_last_alloc = cpu_to_le64(segnum);

			kunmap_atomic(kaddr, KM_USER0);



			NILFS_SUI(sufile)->ncleansegs--;

			nilfs_mdt_mark_buffer_dirty(header_bh);

			nilfs_mdt_mark_buffer_dirty(su_bh);

			nilfs_mdt_mark_dirty(sufile);
@@ -342,6 +353,8 @@ void nilfs_sufile_do_cancel_free(struct inode *sufile, __u64 segnum, 
	kunmap_atomic(kaddr, KM_USER0);



	nilfs_sufile_mod_counter(header_bh, -1, 1);

	NILFS_SUI(sufile)->ncleansegs--;



	nilfs_mdt_mark_buffer_dirty(su_bh);

	nilfs_mdt_mark_dirty(sufile);

}
@@ -371,6 +384,8 @@ void nilfs_sufile_do_scrap(struct inode *sufile, __u64 segnum, 
	kunmap_atomic(kaddr, KM_USER0);



	nilfs_sufile_mod_counter(header_bh, clean ? (u64)-1 : 0, dirty ? 0 : 1);

	NILFS_SUI(sufile)->ncleansegs -= clean;



	nilfs_mdt_mark_buffer_dirty(su_bh);

	nilfs_mdt_mark_dirty(sufile);

}
@@ -400,6 +415,8 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum, 
	nilfs_mdt_mark_buffer_dirty(su_bh);



	nilfs_sufile_mod_counter(header_bh, 1, sudirty ? (u64)-1 : 0);

	NILFS_SUI(sufile)->ncleansegs++;



	nilfs_mdt_mark_dirty(sufile);

}
@@ -541,13 +558,8 @@ int nilfs_sufile_get_stat(struct inode *sufile, struct nilfs_sustat *sustat) 
 */

int nilfs_sufile_get_ncleansegs(struct inode *sufile, unsigned long *nsegsp)

{

	struct nilfs_sustat sustat;

	int ret;



	ret = nilfs_sufile_get_stat(sufile, &sustat);

	if (ret == 0)

		*nsegsp = sustat.ss_ncleansegs;

	return ret;

	*nsegsp = NILFS_SUI(sufile)->ncleansegs;

	return 0;

}



void nilfs_sufile_do_set_error(struct inode *sufile, __u64 segnum,
@@ -568,8 +580,10 @@ void nilfs_sufile_do_set_error(struct inode *sufile, __u64 segnum, 
	nilfs_segment_usage_set_error(su);

	kunmap_atomic(kaddr, KM_USER0);



	if (suclean)

	if (suclean) {

		nilfs_sufile_mod_counter(header_bh, -1, 0);

		NILFS_SUI(sufile)->ncleansegs--;

	}

	nilfs_mdt_mark_buffer_dirty(su_bh);

	nilfs_mdt_mark_dirty(sufile);

}
@@ -656,7 +670,25 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, void *buf, 
 */

int nilfs_sufile_read(struct inode *sufile, struct nilfs_inode *raw_inode)

{

	return nilfs_read_inode_common(sufile, raw_inode);

	struct nilfs_sufile_info *sui = NILFS_SUI(sufile);

	struct buffer_head *header_bh;

	struct nilfs_sufile_header *header;

	void *kaddr;

	int ret;



	ret = nilfs_read_inode_common(sufile, raw_inode);

	if (ret < 0)

		return ret;



	ret = nilfs_sufile_get_header_block(sufile, &header_bh);

	if (!ret) {

		kaddr = kmap_atomic(header_bh->b_page, KM_USER0);

		header = kaddr + bh_offset(header_bh);

		sui->ncleansegs = le64_to_cpu(header->sh_ncleansegs);

		kunmap_atomic(kaddr, KM_USER0);

		brelse(header_bh);

	}

	return ret;

}



/**
@@ -668,7 +700,8 @@ struct inode *nilfs_sufile_new(struct the_nilfs *nilfs, size_t susize) 
{

	struct inode *sufile;



	sufile = nilfs_mdt_new(nilfs, NULL, NILFS_SUFILE_INO, 0);

	sufile = nilfs_mdt_new(nilfs, NULL, NILFS_SUFILE_INO,

			       sizeof(struct nilfs_sufile_info));

	if (sufile)

		nilfs_mdt_set_entry_size(sufile, susize,

					 sizeof(struct nilfs_sufile_header));