]> git.karo-electronics.de Git - linux-beck.git/commitdiff
f2fs: clean up code with __has_cursum_space
authorChao Yu <chao2.yu@samsung.com>
Tue, 1 Dec 2015 03:42:54 +0000 (11:42 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 4 Dec 2015 20:07:55 +0000 (12:07 -0800)
Clean up codes in lookup_journal_in_cursum() with __has_cursum_space().

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/segment.c

index ed2c5dec75267f2780f709a19d51d739c50844d8..74c474821e5a101b33885a4433cc7fc9fd3cac6d 100644 (file)
@@ -1740,13 +1740,13 @@ int lookup_journal_in_cursum(struct f2fs_summary_block *sum, int type,
                        if (le32_to_cpu(nid_in_journal(sum, i)) == val)
                                return i;
                }
-               if (alloc && nats_in_cursum(sum) < NAT_JOURNAL_ENTRIES)
+               if (alloc && __has_cursum_space(sum, 1, NAT_JOURNAL))
                        return update_nats_in_cursum(sum, 1);
        } else if (type == SIT_JOURNAL) {
                for (i = 0; i < sits_in_cursum(sum); i++)
                        if (le32_to_cpu(segno_in_journal(sum, i)) == val)
                                return i;
-               if (alloc && sits_in_cursum(sum) < SIT_JOURNAL_ENTRIES)
+               if (alloc && __has_cursum_space(sum, 1, SIT_JOURNAL))
                        return update_sits_in_cursum(sum, 1);
        }
        return -1;