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

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

nilfs2: rename nilfs_recover_logical_segments function 



The function name of nilfs_recover_logical_segments makes no sense.
This changes the name into nilfs_salvage_orphan_logs to clarify the
role of the function.

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

fs/nilfs2/recovery.c

+5 −6
Original line number Diff line number Diff line
@@ -719,9 +719,8 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs, 
}



/**

 * nilfs_recover_logical_segments - salvage logical segments written after

 * the latest super root

 * @nilfs: the_nilfs

 * nilfs_salvage_orphan_logs - salvage logs written after the latest checkpoint

 * @nilfs: nilfs object

 * @sbi: nilfs_sb_info

 * @ri: pointer to a nilfs_recovery_info struct to store search results.

 *
@@ -738,7 +737,7 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs, 
 *

 * %-ENOMEM - Insufficient memory available.

 */

int nilfs_recover_logical_segments(struct the_nilfs *nilfs,

int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,

			      struct nilfs_sb_info *sbi,

			      struct nilfs_recovery_info *ri)

{

fs/nilfs2/segment.h

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ extern int nilfs_read_super_root_block(struct the_nilfs *, sector_t, 
				       struct buffer_head **, int);

extern int nilfs_search_super_root(struct the_nilfs *,

				   struct nilfs_recovery_info *);

extern int nilfs_recover_logical_segments(struct the_nilfs *,

extern int nilfs_salvage_orphan_logs(struct the_nilfs *,

				     struct nilfs_sb_info *,

				     struct nilfs_recovery_info *);

extern void nilfs_dispose_segment_list(struct list_head *);

fs/nilfs2/the_nilfs.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi) 
		goto failed_unload;

	}



	err = nilfs_recover_logical_segments(nilfs, sbi, &ri);

	err = nilfs_salvage_orphan_logs(nilfs, sbi, &ri);

	if (err)

		goto failed_unload;