Commit 52aca074 authored Oct 20, 2014 by Gu Zheng Committed by Jaegeuk Kim Nov 03, 2014

f2fs: rename f2fs_set/clear_bit to f2fs_test_and_set/clear_bit



Rename f2fs_set/clear_bit to f2fs_test_and_set/clear_bit, which mean
set/clear bit and return the old value, for better readability.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 1730663c

fs/f2fs/f2fs.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1049,7 +1049,7 @@ static inline int f2fs_test_bit(unsigned int nr, char *addr)
		return mask & *addr;
		}

		static inline int f2fs_set_bit(unsigned int nr, char *addr)
		static inline int f2fs_test_and_set_bit(unsigned int nr, char *addr)
		{
		int mask;
		int ret;
		@@ -1061,7 +1061,7 @@ static inline int f2fs_set_bit(unsigned int nr, char *addr)
		return ret;
		}

		static inline int f2fs_clear_bit(unsigned int nr, char *addr)
		static inline int f2fs_test_and_clear_bit(unsigned int nr, char *addr)
		{
		int mask;
		int ret;

fs/f2fs/segment.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -648,10 +648,10 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)

		/* Update valid block bitmap */
		if (del > 0) {
		if (f2fs_set_bit(offset, se->cur_valid_map))
		if (f2fs_test_and_set_bit(offset, se->cur_valid_map))
		f2fs_bug_on(sbi, 1);
		} else {
		if (!f2fs_clear_bit(offset, se->cur_valid_map))
		if (!f2fs_test_and_clear_bit(offset, se->cur_valid_map))
		f2fs_bug_on(sbi, 1);
		}
		if (!f2fs_test_bit(offset, se->ckpt_valid_map))