Merge "f2fs: don't sleep while grabing nat_tree_lock" (046d1cdd) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/f2fs/node.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
		int i;

		ni->nid = nid;

		retry:
		/* Check nat cache */
		down_read(&nm_i->nat_tree_lock);
		e = __lookup_nat_cache(nm_i, nid);
		@@ -546,10 +546,19 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,
		return 0;
		}

		memset(&ne, 0, sizeof(struct f2fs_nat_entry));

		/* Check current segment summary */
		/*
		* Check current segment summary by trying to grab journal_rwsem first.
		* This sem is on the critical path on the checkpoint requiring the above
		* nat_tree_lock. Therefore, we should retry, if we failed to grab here
		* while not bothering checkpoint.
		*/
		if (!rwsem_is_locked(&sbi->cp_global_sem)) {
		down_read(&curseg->journal_rwsem);
		} else if (!down_read_trylock(&curseg->journal_rwsem)) {
		up_read(&nm_i->nat_tree_lock);
		goto retry;
		}

		i = f2fs_lookup_journal_in_cursum(journal, NAT_JOURNAL, nid, 0);
		if (i >= 0) {
		ne = nat_in_journal(journal, i);