f2fs: introduce help macro on_build_free_nids()
Subsystems (2)
PATCH 1/2 f2fs: introduce help macro on_build_free_nids()
Introduce help macro on_build_free_nids() which just uses build_lock to judge whether the building free nid is going, so that we can remove the on_build_free_nids field from f2fs_sb_info.
Signed-off-by Gu Zheng <[email protected]>
--- fs/f2fs/f2fs.h | 2 -- fs/f2fs/node.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
fs/f2fs/f2fs.h +0 -2
@@ -48,7 +48,6 @@#define ver_after (a, b) (typecheck(unsigned long long, a) && \ typecheck(unsigned long long, b) && \ ((long long)((a) - (b)) > 0)) -typedef u32 block_t ;/* * should not change u32, since it is the on-disk block * address format, __le32.
@@ -417,7 +416,6 @@ struct f2fs_sb_info {struct mutex node_write;/* locking node writes */ struct mutex writepages;/* mutex for writepages() */ bool por_doing;/* recovery is doing or not */ -bool on_build_free_nids;/* build_free_nids is doing */ wait_queue_head_t cp_wait;/* for orphan inode management */
fs/f2fs/node.c +3 -3
@@ -21,6 +21,8 @@#include "segment.h" #include <trace/events/f2fs.h> +#define on_build_free_nids (nmi) mutex_is_locked(&nm_i->build_lock) +static struct kmem_cache *nat_entry_slab;static struct kmem_cache *free_nid_slab;
@@ -1426,7 +1428,7 @@ retry:spin_lock (&nm_i->free_nid_list_lock);/* We should not use stale free nids created by build_free_nids */ -if (nm_i->fcnt && !sbi->on_build_free_nids) { +if (nm_i->fcnt && !on_build_free_nids (nm_i)) {f2fs_bug_on (list_empty (&nm_i->free_nid_list));list_for_each (this, &nm_i->free_nid_list) { i = list_entry(this, struct free_nid, list);
@@ -1445,9 +1447,7 @@ retry:/* Let's scan nat pages and its caches to get free nids */ mutex_lock (&nm_i->build_lock); - sbi->on_build_free_nids = true;build_free_nids (sbi); - sbi->on_build_free_nids = false;mutex_unlock (&nm_i->build_lock); goto retry; }
Signature · 8 lines
1.7.7 ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk