Commit 122e9ede authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: add a btrfs_finish_ordered_extent helper 



Add a helper to complete an ordered_extent without first doing a lookup.
The tracepoint cannot use the ordered_extent class as we also want to
print the range.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2d6f107e

fs/btrfs/ordered-data.c

+19 −0
Original line number Diff line number Diff line
@@ -368,6 +368,25 @@ static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered) 
	btrfs_queue_work(wq, &ordered->work);

}



bool btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,

				 struct page *page, u64 file_offset, u64 len,

				 bool uptodate)

{

	struct btrfs_inode *inode = BTRFS_I(ordered->inode);

	unsigned long flags;

	bool ret;



	trace_btrfs_finish_ordered_extent(inode, file_offset, len, uptodate);



	spin_lock_irqsave(&inode->ordered_tree.lock, flags);

	ret = can_finish_ordered_extent(ordered, page, file_offset, len, uptodate);

	spin_unlock_irqrestore(&inode->ordered_tree.lock, flags);



	if (ret)

		btrfs_queue_ordered_fn(ordered);

	return ret;

}



/*

 * Mark all ordered extents io inside the specified range finished.

 *

fs/btrfs/ordered-data.h

+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent); 
void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);

void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,

				struct btrfs_ordered_extent *entry);

bool btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,

				 struct page *page, u64 file_offset, u64 len,

				 bool uptodate);

void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,

				struct page *page, u64 file_offset,

				u64 num_bytes, bool uptodate);

include/trace/events/btrfs.h

+29 −0
Original line number Diff line number Diff line
@@ -661,6 +661,35 @@ DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_mark_finished, 
	     TP_ARGS(inode, ordered)

);



TRACE_EVENT(btrfs_finish_ordered_extent,



	TP_PROTO(const struct btrfs_inode *inode, u64 start, u64 len,

		 bool uptodate),



	TP_ARGS(inode, start, len, uptodate),



	TP_STRUCT__entry_btrfs(

		__field(	u64,	 ino		)

		__field(	u64,	 start		)

		__field(	u64,	 len		)

		__field(	bool,	 uptodate	)

		__field(	u64,	 root_objectid	)

	),



	TP_fast_assign_btrfs(inode->root->fs_info,

		__entry->ino	= btrfs_ino(inode);

		__entry->start	= start;

		__entry->len	= len;

		__entry->uptodate = uptodate;

		__entry->root_objectid = inode->root->root_key.objectid;

	),



	TP_printk_btrfs("root=%llu(%s) ino=%llu start=%llu len=%llu uptodate=%d",

		  show_root_type(__entry->root_objectid),

		  __entry->ino, __entry->start,

		  __entry->len, !!__entry->uptodate)

);



DECLARE_EVENT_CLASS(btrfs__writepage,



	TP_PROTO(const struct page *page, const struct inode *inode,