diff options
| author | Christoph Hellwig <hch@infradead.org> | 2012-02-20 02:31:26 +0000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-02-22 22:21:39 -0600 |
| commit | c303c5b8c3b8eace41c4fba26205b50c0f8e4ca0 (patch) | |
| tree | 61f959e5c3729349f79b9d47224b1a06ba443602 /fs | |
| parent | 28496968a6ac37c8b8c44b5156e633c581bb8378 (diff) | |
| download | linux-3.10-c303c5b8c3b8eace41c4fba26205b50c0f8e4ca0.tar.gz linux-3.10-c303c5b8c3b8eace41c4fba26205b50c0f8e4ca0.tar.bz2 linux-3.10-c303c5b8c3b8eace41c4fba26205b50c0f8e4ca0.zip | |
xfs: add xlog_grant_head_init
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_log.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index ad0cac378e9..30fec0a2a21 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -150,6 +150,15 @@ xlog_grant_add_space( } while (head_val != old); } +STATIC void +xlog_grant_head_init( + struct xlog_grant_head *head) +{ + xlog_assign_grant_head(&head->grant, 1, 0); + INIT_LIST_HEAD(&head->waiters); + spin_lock_init(&head->lock); +} + STATIC bool xlog_reserveq_wake( struct log *log, @@ -1070,12 +1079,9 @@ xlog_alloc_log(xfs_mount_t *mp, xlog_assign_atomic_lsn(&log->l_tail_lsn, 1, 0); xlog_assign_atomic_lsn(&log->l_last_sync_lsn, 1, 0); log->l_curr_cycle = 1; /* 0 is bad since this is initial value */ - xlog_assign_grant_head(&log->l_reserve_head.grant, 1, 0); - xlog_assign_grant_head(&log->l_write_head.grant, 1, 0); - INIT_LIST_HEAD(&log->l_reserve_head.waiters); - INIT_LIST_HEAD(&log->l_write_head.waiters); - spin_lock_init(&log->l_reserve_head.lock); - spin_lock_init(&log->l_write_head.lock); + + xlog_grant_head_init(&log->l_reserve_head); + xlog_grant_head_init(&log->l_write_head); error = EFSCORRUPTED; if (xfs_sb_version_hassector(&mp->m_sb)) { |