UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: move the locking from xlog_state_finish_copy to the callers 

This will allow optimizing various locking cycles in the following
patches.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
This commit is contained in:
Christoph Hellwig 2019-10-14 10:36:41 -07:00 committed by Darrick J. Wong
parent 2c68a1dfbd
commit 390aab0a16
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/xfs/xfs_log.c
View File

@ -1967,7 +1967,6 @@ xlog_dealloc_log(
/* /*
* Update counters atomically now that memcpy is done. * Update counters atomically now that memcpy is done.
*/ */
/* ARGSUSED */
static inline void static inline void
xlog_state_finish_copy( xlog_state_finish_copy(
struct xlog *log, struct xlog *log,
@ -1975,16 +1974,11 @@ xlog_state_finish_copy(
int record_cnt, int record_cnt,
int copy_bytes) int copy_bytes)
{ {
spin_lock(&log->l_icloglock); lockdep_assert_held(&log->l_icloglock);
be32_add_cpu(&iclog->ic_header.h_num_logops, record_cnt); be32_add_cpu(&iclog->ic_header.h_num_logops, record_cnt);
iclog->ic_offset += copy_bytes; iclog->ic_offset += copy_bytes;
}
spin_unlock(&log->l_icloglock);
} /* xlog_state_finish_copy */
/* /*
* print out info relating to regions written which consume * print out info relating to regions written which consume
@ -2266,7 +2260,9 @@ xlog_write_copy_finish(
* This iclog has already been marked WANT_SYNC by * This iclog has already been marked WANT_SYNC by
* xlog_state_get_iclog_space. * xlog_state_get_iclog_space.
*/ */
spin_lock(&log->l_icloglock);
xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt); xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt);
spin_unlock(&log->l_icloglock);
*record_cnt = 0; *record_cnt = 0;
*data_cnt = 0; *data_cnt = 0;
return xlog_state_release_iclog(log, iclog); return xlog_state_release_iclog(log, iclog);
@ -2277,11 +2273,11 @@ xlog_write_copy_finish(
if (iclog->ic_size - log_offset <= sizeof(xlog_op_header_t)) { if (iclog->ic_size - log_offset <= sizeof(xlog_op_header_t)) {
/* no more space in this iclog - push it. */ /* no more space in this iclog - push it. */
spin_lock(&log->l_icloglock);
xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt); xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt);
*record_cnt = 0; *record_cnt = 0;
*data_cnt = 0; *data_cnt = 0;
spin_lock(&log->l_icloglock);
xlog_state_want_sync(log, iclog); xlog_state_want_sync(log, iclog);
spin_unlock(&log->l_icloglock); spin_unlock(&log->l_icloglock);
@ -2504,7 +2500,9 @@ next_lv:
ASSERT(len == 0); ASSERT(len == 0);
spin_lock(&log->l_icloglock);
xlog_state_finish_copy(log, iclog, record_cnt, data_cnt); xlog_state_finish_copy(log, iclog, record_cnt, data_cnt);
spin_unlock(&log->l_icloglock);
if (!commit_iclog) if (!commit_iclog)
return xlog_state_release_iclog(log, iclog); return xlog_state_release_iclog(log, iclog);