From: Joel Becker <joel.becker@oracle.com>
To: ocfs2-devel@oss.oracle.com
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 6/7] ocfs2: Define the contents of the slot_map file.
Date: Wed, 5 Mar 2008 14:52:03 -0800 [thread overview]
Message-ID: <1204757524-21343-7-git-send-email-joel.becker@oracle.com> (raw)
In-Reply-To: <1204757524-21343-1-git-send-email-joel.becker@oracle.com>
The slot map file is merely an array of __le16. Wrap it in a structure for
cleaner reference.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
---
fs/ocfs2/ocfs2_fs.h | 12 ++++++++++++
fs/ocfs2/slot_map.c | 15 ++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index 3633edd..3299116 100644
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -475,6 +475,18 @@ struct ocfs2_extent_block
};
/*
+ * On disk slot map for OCFS2. This defines the contents of the "slot_map"
+ * system file.
+ */
+struct ocfs2_slot_map {
+/*00*/ __le16 sm_slots[0];
+/*
+ * Actual on-disk size is one block. OCFS2_MAX_SLOTS is 255,
+ * 255 * sizeof(__le16) == 512B, within the 512B block minimum blocksize.
+ */
+};
+
+/*
* On disk superblock for OCFS2
* Note that it is contained inside an ocfs2_dinode, so all offsets
* are relative to the start of ocfs2_dinode.id2.
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index 65a61bf..e7e7a74 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -85,17 +85,17 @@ static void ocfs2_set_slot(struct ocfs2_slot_info *si,
static void ocfs2_update_slot_info(struct ocfs2_slot_info *si)
{
int i;
- __le16 *disk_info;
+ struct ocfs2_slot_map *sm;
/* we don't read the slot block here as ocfs2_super_lock
* should've made sure we have the most recent copy. */
- disk_info = (__le16 *) si->si_bh[0]->b_data;
+ sm = (struct ocfs2_slot_map *)si->si_bh[0]->b_data;
for (i = 0; i < si->si_num_slots; i++) {
- if (le16_to_cpu(disk_info[i]) == (u16)OCFS2_INVALID_SLOT)
+ if (le16_to_cpu(sm->sm_slots[i]) == (u16)OCFS2_INVALID_SLOT)
ocfs2_invalidate_slot(si, i);
else
- ocfs2_set_slot(si, i, le16_to_cpu(disk_info[i]));
+ ocfs2_set_slot(si, i, le16_to_cpu(sm->sm_slots[i]));
}
}
@@ -135,15 +135,16 @@ static int ocfs2_update_disk_slots(struct ocfs2_super *osb,
struct ocfs2_slot_info *si)
{
int status, i;
- __le16 *disk_info = (__le16 *) si->si_bh[0]->b_data;
+ struct ocfs2_slot_map *sm;
spin_lock(&osb->osb_lock);
+ sm = (struct ocfs2_slot_map *)si->si_bh[0]->b_data;
for (i = 0; i < si->si_num_slots; i++) {
if (si->si_slots[i].sl_valid)
- disk_info[i] =
+ sm->sm_slots[i] =
cpu_to_le16(si->si_slots[i].sl_node_num);
else
- disk_info[i] = cpu_to_le16(OCFS2_INVALID_SLOT);
+ sm->sm_slots[i] = cpu_to_le16(OCFS2_INVALID_SLOT);
}
spin_unlock(&osb->osb_lock);
--
1.5.3.8
next prev parent reply other threads:[~2008-03-05 22:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-05 22:51 [PATCH 0/7] ocfs2: Extended slot map Joel Becker
2008-03-05 22:51 ` [PATCH 1/7] ocfs2: Move slot map access into slot_map.c Joel Becker
2008-03-05 22:51 ` [PATCH 2/7] ocfs2: Make ocfs2_slot_info private Joel Becker
2008-03-05 22:52 ` [PATCH 3/7] ocfs2: Change the recovery map to an array of node numbers Joel Becker
2008-03-05 22:52 ` [PATCH 4/7] ocfs2: slot_map I/O based on max_slots Joel Becker
2008-03-05 22:52 ` [PATCH 5/7] ocfs2: De-magic the in-memory slot map Joel Becker
2008-03-05 22:52 ` Joel Becker [this message]
2008-03-05 22:52 ` [PATCH 7/7] ocfs2: New slot map format Joel Becker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1204757524-21343-7-git-send-email-joel.becker@oracle.com \
--to=joel.becker@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®