diff options
| author | Dave Chinner <dchinner@redhat.com> | 2010-12-21 12:08:20 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2010-12-21 12:08:20 +1100 |
| commit | a69ed03c24d4a336c23b7116127713d5a8c5ac4d (patch) | |
| tree | 95c73e560b2780abc9125022032e8cc85ec518c7 /fs/xfs/xfs_log_recover.c | |
| parent | 663e496a720a3a9fc08ea70b29724e8906b34e43 (diff) | |
| download | op-kernel-dev-a69ed03c24d4a336c23b7116127713d5a8c5ac4d.zip op-kernel-dev-a69ed03c24d4a336c23b7116127713d5a8c5ac4d.tar.gz | |
xfs: combine grant heads into a single 64 bit integer
Prepare for switching the grant heads to atomic variables by
combining the two 32 bit values that make up the grant head into a
single 64 bit variable. Provide wrapper functions to combine and
split the grant heads appropriately for calculations and use them as
necessary.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 4abe7a9..1550404 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -938,10 +938,10 @@ xlog_find_tail( log->l_curr_cycle++; log->l_tail_lsn = be64_to_cpu(rhead->h_tail_lsn); log->l_last_sync_lsn = be64_to_cpu(rhead->h_lsn); - log->l_grant_reserve_cycle = log->l_curr_cycle; - log->l_grant_reserve_bytes = BBTOB(log->l_curr_block); - log->l_grant_write_cycle = log->l_curr_cycle; - log->l_grant_write_bytes = BBTOB(log->l_curr_block); + xlog_assign_grant_head(&log->l_grant_reserve_head, log->l_curr_cycle, + BBTOB(log->l_curr_block)); + xlog_assign_grant_head(&log->l_grant_write_head, log->l_curr_cycle, + BBTOB(log->l_curr_block)); /* * Look for unmount record. If we find it, then we know there |
