Skip to contentSkip to conversation

hfsplus: implement replay transaction's block functionality

PATCH Superseded Vyacheslav Dubeyko 1 participant 1 message Dec 26, 2013

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Vyacheslav Dubeyko

author maintainer
#0 lore raw

PATCH 12/14 hfsplus: implement replay transaction's block functionality

From: Vyacheslav Dubeyko <[email protected]>
Subject: [PATCH 12/14] hfsplus: implement replay transaction's block functionality

A group of related changes is called a transaction. When all of the changes of a transaction have been written to their normal locations on disk, that transaction has been committed, and is removed from the journal. The journal may contain several transactions. Copying changes from all transactions to their normal locations on disk is called replaying the journal.

A single transaction consists of several blocks, including both the data to be written, and the location where that data is to be written. This is represented on disk by a block list header, which describes the number and sizes of the blocks, immediately followed by the contents of those blocks.

This patch implements replaying of transaction's block in location is described by binfo in block list.

CC Al Viro <[email protected]>
CC Christoph Hellwig <[email protected]>
CC Hin-Tak Leung <[email protected]>
---
 fs/hfsplus/journal.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
fs/hfsplus/journal.c +87 -0
index d061c7f..fb44829 100644
@@ -590,6 +590,93 @@ static int hfsplus_check_transaction_block(struct super_block *sb, int i,
 	return 0;
 }
 
+static int hfsplus_replay_transaction_block(struct super_block *sb, int i,
+					    struct hfsplus_blist_desc *desc)
+{
+	struct hfsplus_journal *jnl = HFSPLUS_SB(sb)->jnl;
+	struct hfsplus_journal_header *jh = jnl->jh;
+	struct hfsplus_block_info *binfo;
+	u64 bnum;
+	u32 bsize;
+	sector_t src_sec, dst_sec;
+
+	hfs_dbg(JREPLAY, "replay binfo[%u]\n", i);
+
+	binfo = hfsplus_get_binfo(sb, i, desc);
+	if (!binfo) {
+		pr_err("unable to get binfo[%u]\n", i);
+		return -EIO;
+	}
+
+	bnum = BNUM(binfo);
+	bsize = BSIZE(binfo);
+
+	hfs_dbg(JREPLAY, "bnum: %llu, bsize: %u\n", bnum, bsize);
+
+	if (bnum == ~(u64)0) {
+		hfs_dbg(JREPLAY, "don't add *killed* block %llu\n", bnum);
+		return 0; /* don't add "killed" blocks */
+	}
+
+	src_sec = JOURNAL_OFF_TO_SEC(sb);
+	dst_sec = HFSPLUS_SB(sb)->blockoffset + bnum;
+
+	hfs_dbg(JREPLAY, "dst_sec: %lu, bsize: %u\n",
+		dst_sec, bsize);
+
+	while (bsize > 0) {
+		size_t buf_size = hfsplus_min_io_size(sb);
+		size_t dst_off = 0;
+		size_t rest_bytes;
+		int err;
+
+		if (dst_sec >= HFSPLUS_SB(sb)->sect_count) {
+			pr_err("replay out of volume %lu\n", dst_sec);
+			return -EIO;
+		}
+
+		while (dst_off < buf_size) {
+			void *src_ptr;
+			size_t copy_size = HFSPLUS_SECTOR_SIZE;
+
+			if (need_to_wrap_journal(jh, TR_START(jh), copy_size)) {
+				hfsplus_wrap_journal(sb, TR_START(jh),
+							copy_size);
+				src_sec = JOURNAL_OFF_TO_SEC(sb);
+			}
+
+			err = hfsplus_submit_bio(sb, src_sec, desc->src_buf,
+						 &src_ptr, READ, &rest_bytes);
+			if (err) {
+				pr_err("can't read sector %lu of block list\n",
+					src_sec);
+				return err;
+			}
+
+			BUG_ON(rest_bytes < HFSPLUS_SECTOR_SIZE);
+
+			memcpy((void *)((u8 *)desc->dst_buf + dst_off),
+				desc->src_buf, copy_size);
+
+			dst_off += copy_size;
+			bsize -= copy_size;
+			le64_add_cpu(&jh->start, copy_size);
+			src_sec = JOURNAL_OFF_TO_SEC(sb);
+		}
+
+		err = hfsplus_submit_bio(sb, dst_sec, desc->dst_buf, NULL,
+					 WRITE_SYNC, NULL);
+		if (err) {
+			pr_err("can't replay sector %lu\n", dst_sec);
+			return err;
+		}
+
+		dst_sec += buf_size >> HFSPLUS_SECTOR_SHIFT;
+	}
+
+	return 0;
+}
+
 static inline
 bool hfsplus_journal_empty(struct hfsplus_journal_header *jh)
 {
Signature · 1 line
1.7.9.5