Commit e97a3c4c authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: trace f2fs_readdir 



This patch adds trace for f2fs_readdir.

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

fs/f2fs/dir.c

+9 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "node.h"

#include "acl.h"

#include "xattr.h"

#include <trace/events/f2fs.h>



static unsigned long dir_blocks(struct inode *inode)

{
@@ -847,6 +848,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
	struct f2fs_dentry_block *dentry_blk = NULL;

	struct page *dentry_page = NULL;

	struct file_ra_state *ra = &file->f_ra;

	loff_t start_pos = ctx->pos;

	unsigned int n = ((unsigned long)ctx->pos / NR_DENTRY_IN_BLOCK);

	struct f2fs_dentry_ptr d;

	struct fscrypt_str fstr = FSTR_INIT(NULL, 0);
@@ -855,16 +857,16 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
	if (f2fs_encrypted_inode(inode)) {

		err = fscrypt_get_encryption_info(inode);

		if (err && err != -ENOKEY)

			return err;

			goto out;



		err = fscrypt_fname_alloc_buffer(inode, F2FS_NAME_LEN, &fstr);

		if (err < 0)

			return err;

			goto out;

	}



	if (f2fs_has_inline_dentry(inode)) {

		err = f2fs_read_inline_dir(file, ctx, &fstr);

		goto out;

		goto out_free;

	}



	/* readahead for multi pages of dir */
@@ -880,7 +882,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
				err = 0;

				continue;

			} else {

				goto out;

				goto out_free;

			}

		}
@@ -900,8 +902,10 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
		kunmap(dentry_page);

		f2fs_put_page(dentry_page, 1);

	}

out:

out_free:

	fscrypt_fname_free_buffer(&fstr);

out:

	trace_f2fs_readdir(inode, start_pos, ctx->pos, err);

	return err < 0 ? err : 0;

}

include/trace/events/f2fs.h

+29 −0
Original line number Diff line number Diff line
@@ -784,6 +784,35 @@ TRACE_EVENT(f2fs_lookup_end, 
		__entry->err)

);



TRACE_EVENT(f2fs_readdir,



	TP_PROTO(struct inode *dir, loff_t start_pos, loff_t end_pos, int err),



	TP_ARGS(dir, start_pos, end_pos, err),



	TP_STRUCT__entry(

		__field(dev_t,	dev)

		__field(ino_t,	ino)

		__field(loff_t,	start)

		__field(loff_t,	end)

		__field(int,	err)

	),



	TP_fast_assign(

		__entry->dev	= dir->i_sb->s_dev;

		__entry->ino	= dir->i_ino;

		__entry->start	= start_pos;

		__entry->end	= end_pos;

		__entry->err	= err;

	),



	TP_printk("dev = (%d,%d), ino = %lu, start_pos:%llu, end_pos:%llu, err:%d",

		show_dev_ino(__entry),

		__entry->start,

		__entry->end,

		__entry->err)

);



TRACE_EVENT(f2fs_fallocate,



	TP_PROTO(struct inode *inode, int mode,