[f2fs-dev] [PATCH 3/3] f2fs_io: rename mlock to fadvise

[Jaegeuk Kim via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>]

fadvise is better to describe the read method.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 tools/f2fs_io/f2fs_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index d5e103f7b833..35c367bd67e7 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -939,7 +939,7 @@ static void do_write_advice(int argc, char **argv, const struct cmd_desc *cmd)
 "  dio      : direct IO\n"				\
 "  mmap     : mmap IO\n"				\
 "  madvise  : mmap + mlock2 + madvise\n"		\
-"  mlock    : mmap + mlock\n"				\
+"  fadvise  : mmap + fadvise + mlock\n"			\
 "advice can be\n"					\
 " 1 : set sequential|willneed\n"			\
 " 0 : none\n"						\
@@ -956,7 +956,7 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
 	u64 mlock_time_start = 0, mlock_time_end = 0;
 	int flags = 0;
 	int do_mmap = 0;
-	int do_mlock = 0;
+	int do_fadvise = 0;
 	int do_madvise = 0;
 	int do_dontcache = 0;
 	int fd, advice;
@@ -983,8 +983,8 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
 		do_mmap = 1;
 	else if (!strcmp(argv[4], "madvise"))
 		do_madvise = 1;
-	else if (!strcmp(argv[4], "mlock"))
-		do_mlock = 1;
+	else if (!strcmp(argv[4], "fadvise"))
+		do_fadvise = 1;
 	else if (!strcmp(argv[4], "dontcache"))
 #ifdef HAVE_PREADV2
 		do_dontcache = 1;
@@ -1045,7 +1045,7 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
 
 		read_cnt = count * buf_size;
 		memcpy(print_buf, data, print_bytes);
-	} else if (do_mlock) {
+	} else if (do_fadvise) {
 		data = mmap(NULL, count * buf_size, PROT_READ,
 				MAP_SHARED, fd, offset);
 		if (data == MAP_FAILED)
@@ -1107,7 +1107,7 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
 	}
 	if (do_mmap) {
 		munmap(data, count * buf_size);
-	} else if (do_mlock || do_madvise) {
+	} else if (do_fadvise || do_madvise) {
 		munlock(data, count * buf_size);
 		munmap(data, count * buf_size);
 	}
-- 
2.52.0.107.ga0afd4fd5b-goog



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel