fs/hfs/catalog.c: use list_for_each_entry in hfs_cat_delete
authorGeliang Tang <geliangtang@163.com>
Wed, 20 Jan 2016 22:59:32 +0000 (14:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 01:09:18 +0000 (17:09 -0800)
Use list_for_each_entry() instead of list_for_each() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/hfs/catalog.c

index db458ee3a546757947a909d1073cb0ac690f66a5..1eb5d415d4346c460f715c90f2127da40830b8fb 100644 (file)
@@ -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--;
        }