diff options
author | Geliang Tang <geliangtang@163.com> | 2016-01-20 17:59:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 20:09:18 -0500 |
commit | 2c35dea279351f2ad74a99126b29f9f5394ccc04 (patch) | |
tree | 90ae39aaea2934102d2d9ba9abef7174e41c929a /fs/hfs | |
parent | f057f3b226a5c513aafaa5ece94f3a7f363215c5 (diff) |
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: 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>
Diffstat (limited to 'fs/hfs')
-rw-r--r-- | fs/hfs/catalog.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c index db458ee3a546..1eb5d415d434 100644 --- a/fs/hfs/catalog.c +++ b/fs/hfs/catalog.c | |||
@@ -214,7 +214,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str) | |||
214 | { | 214 | { |
215 | struct super_block *sb; | 215 | struct super_block *sb; |
216 | struct hfs_find_data fd; | 216 | struct hfs_find_data fd; |
217 | struct list_head *pos; | 217 | struct hfs_readdir_data *rd; |
218 | int res, type; | 218 | int res, type; |
219 | 219 | ||
220 | hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid); | 220 | 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) | |||
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | list_for_each(pos, &HFS_I(dir)->open_dir_list) { | 243 | list_for_each_entry(rd, &HFS_I(dir)->open_dir_list, list) { |
244 | struct hfs_readdir_data *rd = | ||
245 | list_entry(pos, struct hfs_readdir_data, list); | ||
246 | if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0) | 244 | if (fd.tree->keycmp(fd.search_key, (void *)&rd->key) < 0) |
247 | rd->file->f_pos--; | 245 | rd->file->f_pos--; |
248 | } | 246 | } |