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

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

nilfs2: add helper to get if volume is in a valid state 



This adds a helper function, nilfs_valid_fs() which returns if nilfs
is in a valid state or not.

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

fs/nilfs2/the_nilfs.c

+1 −5
Original line number Diff line number Diff line
@@ -261,16 +261,12 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) 
	struct nilfs_recovery_info ri;

	unsigned int s_flags = sbi->s_super->s_flags;

	int really_read_only = bdev_read_only(nilfs->ns_bdev);

	unsigned valid_fs;

	int valid_fs = nilfs_valid_fs(nilfs);

	int err;



	if (nilfs_loaded(nilfs))

		return 0;



	down_write(&nilfs->ns_sem);

	valid_fs = (nilfs->ns_mount_state & NILFS_VALID_FS);

	up_write(&nilfs->ns_sem);



	if (!valid_fs) {

		printk(KERN_WARNING "NILFS warning: mounting unchecked fs\n");

		if (s_flags & MS_RDONLY) {

fs/nilfs2/the_nilfs.h

+10 −0
Original line number Diff line number Diff line
@@ -258,6 +258,16 @@ static inline void nilfs_put_sbinfo(struct nilfs_sb_info *sbi) 
		kfree(sbi);

}



static inline int nilfs_valid_fs(struct the_nilfs *nilfs)

{

	unsigned valid_fs;



	down_read(&nilfs->ns_sem);

	valid_fs = (nilfs->ns_mount_state & NILFS_VALID_FS);

	up_read(&nilfs->ns_sem);

	return valid_fs;

}



static inline void

nilfs_get_segment_range(struct the_nilfs *nilfs, __u64 segnum,

			sector_t *seg_start, sector_t *seg_end)