Commit d5f7bc00 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: deprecate f2fs_trace_io 



This patch deprecates f2fs_trace_io, since f2fs uses page->private more broadly,
resulting in more buggy cases.

Acked-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 12699fb7

fs/f2fs/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -76,16 +76,6 @@ config F2FS_CHECK_FS 


	  If you want to improve the performance, say N.



config F2FS_IO_TRACE

	bool "F2FS IO tracer"

	depends on F2FS_FS

	depends on FUNCTION_TRACER

	help

	  F2FS IO trace is based on a function trace, which gathers process

	  information and block IO patterns in the filesystem level.



	  If unsure, say N.



config F2FS_FAULT_INJECTION

	bool "F2FS fault injection facility"

	depends on F2FS_FS

fs/f2fs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ f2fs-y += shrinker.o extent_cache.o sysfs.o 
f2fs-$(CONFIG_F2FS_STAT_FS) += debug.o

f2fs-$(CONFIG_F2FS_FS_XATTR) += xattr.o

f2fs-$(CONFIG_F2FS_FS_POSIX_ACL) += acl.o

f2fs-$(CONFIG_F2FS_IO_TRACE) += trace.o

f2fs-$(CONFIG_FS_VERITY) += verity.o

f2fs-$(CONFIG_F2FS_FS_COMPRESSION) += compress.o

fs/f2fs/checkpoint.c

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "f2fs.h"

#include "node.h"

#include "segment.h"

#include "trace.h"

#include <trace/events/f2fs.h>



static struct kmem_cache *ino_entry_slab;
@@ -443,7 +442,6 @@ static int f2fs_set_meta_page_dirty(struct page *page) 
		__set_page_dirty_nobuffers(page);

		inc_page_count(F2FS_P_SB(page), F2FS_DIRTY_META);

		f2fs_set_page_private(page, 0);

		f2fs_trace_pid(page);

		return 1;

	}

	return 0;
@@ -1017,7 +1015,6 @@ void f2fs_update_dirty_page(struct inode *inode, struct page *page) 
	spin_unlock(&sbi->inode_lock[type]);



	f2fs_set_page_private(page, 0);

	f2fs_trace_pid(page);

}



void f2fs_remove_dirty_inode(struct inode *inode)

fs/f2fs/data.c

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "f2fs.h"

#include "node.h"

#include "segment.h"

#include "trace.h"

#include <trace/events/f2fs.h>



#define NUM_PREALLOC_POST_READ_CTXS	128
@@ -679,7 +678,6 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 
		return -EFSCORRUPTED;



	trace_f2fs_submit_page_bio(page, fio);

	f2fs_trace_ios(fio, 0);



	/* Allocate a new bio */

	bio = __bio_alloc(fio, 1);
@@ -884,7 +882,6 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) 
		return -EFSCORRUPTED;



	trace_f2fs_submit_page_bio(page, fio);

	f2fs_trace_ios(fio, 0);



	if (bio && !page_is_mergeable(fio->sbi, bio, *fio->last_block,

						fio->new_blkaddr))
@@ -981,7 +978,6 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
		wbc_account_cgroup_owner(fio->io_wbc, bio_page, PAGE_SIZE);



	io->last_block_in_bio = fio->new_blkaddr;

	f2fs_trace_ios(fio, 0);



	trace_f2fs_submit_page_write(fio->page, fio);

skip:

fs/f2fs/file.c

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "xattr.h"

#include "acl.h"

#include "gc.h"

#include "trace.h"

#include <trace/events/f2fs.h>

#include <uapi/linux/f2fs.h>
@@ -369,7 +368,6 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, 
	f2fs_update_time(sbi, REQ_TIME);

out:

	trace_f2fs_sync_file_exit(inode, cp_reason, datasync, ret);

	f2fs_trace_ios(NULL, 1);

	return ret;

}