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

Commit 2c35dea2 authored by Geliang Tang's avatar Geliang Tang Committed by Linus Torvalds
Browse files

fs/hfs/catalog.c: use list_for_each_entry in hfs_cat_delete 



Use list_for_each_entry() instead of list_for_each() to simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Reviewed-by: default avatarVyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f057f3b2

fs/hfs/catalog.c

+2 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str) 
{

	struct super_block *sb;

	struct hfs_find_data fd;

	struct list_head *pos;

	struct hfs_readdir_data *rd;

	int res, type;



	hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
@@ -240,9 +240,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str) 
		}

	}



	list_for_each(pos, &HFS_I(dir)->open_dir_list) {

		struct hfs_readdir_data *rd =

			list_entry(pos, struct hfs_readdir_data, list);

	list_for_each_entry(rd, &HFS_I(dir)->open_dir_list, list) {

		if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0)

			rd->file->f_pos--;

	}