diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
| commit | b76a852bfb51ffe25505bab3dfd87ddbc821c2aa (patch) | |
| tree | 25e4f88a1d60f92c7f00f19e835a23d1502c5c82 /fs/xfs/xfs_log_recover.c | |
| parent | 612cbdcf44289e81a4327d8f67fcc41e07ad33c3 (diff) | |
| parent | 6ab007bf3fd8db711771db1e93880213a63ecd38 (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 617eead8f1..6eddf1a0d5 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -1287,10 +1287,6 @@ xlog_recover_add_to_trans(xlog_recover_t *trans, if (!len) return 0; - ptr = kmem_zalloc(len, 0); - memcpy(ptr, dp, len); - - in_f = (xfs_inode_log_format_t *)ptr; item = trans->r_itemq; if (item == 0) { ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC); @@ -1299,6 +1295,11 @@ xlog_recover_add_to_trans(xlog_recover_t *trans, memcpy(&trans->r_theader, dp, len); /* d, s, l */ return 0; } + + ptr = kmem_alloc(len, 0); + memcpy(ptr, dp, len); + in_f = (xfs_inode_log_format_t *)ptr; + if (item->ri_prev->ri_total != 0 && item->ri_prev->ri_total == item->ri_prev->ri_cnt) { xlog_recover_add_item(&trans->r_itemq); |