Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1202d4ba authored by Jia Guo's avatar Jia Guo Committed by Linus Torvalds
Browse files

ocfs2: keep the trace point consistent with the function name 

Keep the trace point consistent with the function name.

Link: http://lkml.kernel.org/r/02609aba-84b2-a22d-3f3b-bc1944b94260@huawei.com


Fixes: 3ef045c3 ("ocfs2: switch to ->write_iter()")
Signed-off-by: default avatarJia Guo <guojia12@huawei.com>
Reviewed-by: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarYiwen Jiang <jiangyiwen@huawei.com>
Reviewed-by: default avatarAlex Chen <alex.chen@huawei.com>
Acked-by: default avatarGang He <ghe@suse.com>
Acked-by: default avatarJoseph Qi <jiangqi903@gmail.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <ge.changwei@h3c.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bb4c9d67

fs/ocfs2/aops.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level) 
/*

 * Using a named enum representing lock types in terms of #N bit stored in

 * iocb->private, which is going to be used for communication between

 * ocfs2_dio_end_io() and ocfs2_file_aio_write/read().

 * ocfs2_dio_end_io() and ocfs2_file_write/read_iter().

 */

enum ocfs2_iocb_lock_bits {

	OCFS2_IOCB_RW_LOCK = 0,

fs/ocfs2/file.c

+4 −4
Original line number Diff line number Diff line
@@ -2257,7 +2257,7 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, 
	int direct_io = iocb->ki_flags & IOCB_DIRECT ? 1 : 0;

	int nowait = iocb->ki_flags & IOCB_NOWAIT ? 1 : 0;



	trace_ocfs2_file_aio_write(inode, file, file->f_path.dentry,

	trace_ocfs2_file_write_iter(inode, file, file->f_path.dentry,

		(unsigned long long)OCFS2_I(inode)->ip_blkno,

		file->f_path.dentry->d_name.len,

		file->f_path.dentry->d_name.name,
@@ -2405,7 +2405,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, 
	int direct_io = iocb->ki_flags & IOCB_DIRECT ? 1 : 0;

	int nowait = iocb->ki_flags & IOCB_NOWAIT ? 1 : 0;



	trace_ocfs2_file_aio_read(inode, filp, filp->f_path.dentry,

	trace_ocfs2_file_read_iter(inode, filp, filp->f_path.dentry,

			(unsigned long long)OCFS2_I(inode)->ip_blkno,

			filp->f_path.dentry->d_name.len,

			filp->f_path.dentry->d_name.name,
@@ -2448,7 +2448,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, 
	 *

	 * Take and drop the meta data lock to update inode fields

	 * like i_size. This allows the checks down below

	 * generic_file_aio_read() a chance of actually working.

	 * generic_file_read_iter() a chance of actually working.

	 */

	ret = ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level,

				     !nowait);
@@ -2460,7 +2460,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb, 
	ocfs2_inode_unlock(inode, lock_level);



	ret = generic_file_read_iter(iocb, to);

	trace_generic_file_aio_read_ret(ret);

	trace_generic_file_read_iter_ret(ret);



	/* buffered aio wouldn't have proper lock coverage today */

	BUG_ON(ret == -EIOCBQUEUED && !(iocb->ki_flags & IOCB_DIRECT));

fs/ocfs2/ocfs2_trace.h

+3 −3
Original line number Diff line number Diff line
@@ -1311,11 +1311,11 @@ DEFINE_OCFS2_FILE_OPS(ocfs2_file_release); 


DEFINE_OCFS2_FILE_OPS(ocfs2_sync_file);



DEFINE_OCFS2_FILE_OPS(ocfs2_file_aio_write);

DEFINE_OCFS2_FILE_OPS(ocfs2_file_write_iter);



DEFINE_OCFS2_FILE_OPS(ocfs2_file_splice_write);



DEFINE_OCFS2_FILE_OPS(ocfs2_file_aio_read);

DEFINE_OCFS2_FILE_OPS(ocfs2_file_read_iter);



DEFINE_OCFS2_ULL_ULL_ULL_EVENT(ocfs2_truncate_file);
@@ -1467,7 +1467,7 @@ TRACE_EVENT(ocfs2_prepare_inode_for_write, 
		  __entry->saved_pos, __entry->count, __entry->wait)

);



DEFINE_OCFS2_INT_EVENT(generic_file_aio_read_ret);

DEFINE_OCFS2_INT_EVENT(generic_file_read_iter_ret);



/* End of trace events for fs/ocfs2/file.c. */