From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 25/32] db: add a special attribute buffer verifier
Date: Mon, 30 Sep 2013 13:15:37 +1000 [thread overview]
Message-ID: <1380510944-8571-26-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1380510944-8571-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Because we only have a single attribute type that is used for all
the attribute buffer types, we need to provide a special verifier
for the read code. That verifier needs to know all the attribute
types and when it find one it knows about, switch to the correct
verifier and call it.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
db/attr.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
db/attr.h | 2 ++
db/type.c | 3 ++-
3 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/db/attr.c b/db/attr.c
index cd95a0a..359af7b 100644
--- a/db/attr.c
+++ b/db/attr.c
@@ -25,6 +25,7 @@
#include "attr.h"
#include "io.h"
#include "init.h"
+#include "output.h"
static int attr_leaf_entries_count(void *obj, int startoff);
static int attr_leaf_hdr_count(void *obj, int startoff);
@@ -522,3 +523,53 @@ const field_t attr3_leaf_hdr_flds[] = {
{ NULL }
};
+/*
+ * Special read verifier for attribute buffers. detect the magic number
+ * appropriately and set the correct verifier and call it.
+ */
+static void
+xfs_attr3_db_read_verify(
+ struct xfs_buf *bp)
+{
+ __be32 magic32;
+ __be16 magic16;
+
+ magic32 = *(__be32 *)bp->b_addr;
+ magic16 = ((struct xfs_da_blkinfo *)bp->b_addr)->magic;
+
+ switch (magic16) {
+ case cpu_to_be16(XFS_ATTR3_LEAF_MAGIC):
+ bp->b_ops = &xfs_attr3_leaf_buf_ops;
+ goto verify;
+ case cpu_to_be16(XFS_DA3_NODE_MAGIC):
+ bp->b_ops = &xfs_da3_node_buf_ops;
+ goto verify;
+ default:
+ break;
+ }
+
+ switch (magic32) {
+ case cpu_to_be32(XFS_ATTR3_RMT_MAGIC):
+ bp->b_ops = &xfs_attr3_rmt_buf_ops;
+ break;
+ default:
+ dbprintf(_("Unknown attribute buffer type!\n"));
+ xfs_buf_ioerror(bp, EFSCORRUPTED);
+ return;
+ }
+verify:
+ bp->b_ops->verify_read(bp);
+}
+
+static void
+xfs_attr3_db_write_verify(
+ struct xfs_buf *bp)
+{
+ dbprintf(_("Writing unknown attribute buffer type!\n"));
+ xfs_buf_ioerror(bp, EFSCORRUPTED);
+}
+
+const struct xfs_buf_ops xfs_attr3_db_buf_ops = {
+ .verify_read = xfs_attr3_db_read_verify,
+ .verify_write = xfs_attr3_db_write_verify,
+};
diff --git a/db/attr.h b/db/attr.h
index 3065372..bc3431f 100644
--- a/db/attr.h
+++ b/db/attr.h
@@ -33,3 +33,5 @@ extern const field_t attr3_node_hdr_flds[];
extern int attr_leaf_name_size(void *obj, int startoff, int idx);
extern int attr_size(void *obj, int startoff, int idx);
+
+extern const struct xfs_buf_ops xfs_attr3_db_buf_ops;
diff --git a/db/type.c b/db/type.c
index 2c3431e..04d0d56 100644
--- a/db/type.c
+++ b/db/type.c
@@ -77,7 +77,8 @@ static const typ_t __typtab_crc[] = {
{ TYP_AGF, "agf", handle_struct, agf_hfld, &xfs_agf_buf_ops },
{ TYP_AGFL, "agfl", handle_struct, agfl_crc_hfld, &xfs_agfl_buf_ops },
{ TYP_AGI, "agi", handle_struct, agi_hfld, &xfs_agfl_buf_ops },
- { TYP_ATTR, "attr3", handle_struct, attr3_hfld, NULL },
+ { TYP_ATTR, "attr3", handle_struct, attr3_hfld,
+ &xfs_attr3_db_buf_ops },
{ TYP_BMAPBTA, "bmapbta", handle_struct, bmapbta_crc_hfld,
&xfs_bmbt_buf_ops },
{ TYP_BMAPBTD, "bmapbtd", handle_struct, bmapbtd_crc_hfld,
--
1.8.3.2
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-09-30 3:15 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1380510944-8571-1-git-send-email-david@fromorbit.com>
2013-09-30 3:15 ` [PATCH 01/32] xfsprogs: fix automatic dependency generation Dave Chinner
2013-10-08 23:00 ` Eric Sandeen
2013-09-30 3:15 ` [PATCH 02/32] libxfs: fix missing filetype updates to xfs_dir2.c Dave Chinner
2013-10-08 22:53 ` Eric Sandeen
2013-10-09 20:41 ` Dave Chinner
2013-10-18 16:45 ` Rich Johnston
2013-09-30 3:15 ` [PATCH 03/32] xfs: fix some minor sparse warnings Dave Chinner
2013-10-08 22:56 ` Eric Sandeen
2013-10-09 20:43 ` Dave Chinner
2013-09-30 3:15 ` [PATCH 04/32] xfs: check magic numbers in dir3 leaf verifier first Dave Chinner
2013-10-08 23:03 ` Eric Sandeen
2013-10-09 20:45 ` Dave Chinner
2013-10-09 20:50 ` Eric Sandeen
2013-09-30 3:15 ` [PATCH 05/32] xfs: ensure we copy buffer type in da btree root splits Dave Chinner
2013-10-08 23:06 ` Eric Sandeen
2013-10-18 16:49 ` Rich Johnston
2013-09-30 3:15 ` [PATCH 06/32] xfs: don't assert fail on bad inode numbers Dave Chinner
2013-10-08 23:09 ` Eric Sandeen
2013-09-30 3:15 ` [PATCH 07/32] xfs: dirent dtype presence is dependent on directory magic numbers Dave Chinner
2013-10-08 23:30 ` Eric Sandeen
2013-10-09 20:51 ` Dave Chinner
2013-10-09 20:57 ` Eric Sandeen
2013-10-18 22:38 ` Rich Johnston
2013-09-30 3:15 ` [PATCH 08/32] xfs: create a shared header file for format-related information Dave Chinner
2013-10-08 23:37 ` Eric Sandeen
2013-10-18 16:59 ` Rich Johnston
2013-10-18 22:40 ` Dave Chinner
2013-10-18 22:43 ` Rich Johnston
2013-10-22 18:07 ` Rich Johnston
2013-09-30 3:15 ` [PATCH 09/32] xfs: unify directory/attribute format definitions Dave Chinner
2013-10-14 20:44 ` Eric Sandeen
2013-10-18 20:32 ` Rich Johnston
2013-10-22 22:25 ` Dave Chinner
2013-09-30 3:15 ` [PATCH 10/32] xfs: split dquot buffer operations out Dave Chinner
2013-09-30 3:15 ` [PATCH 11/32] xfs: decouple inode and bmap btree header files Dave Chinner
2013-09-30 3:15 ` [PATCH 12/32] libxfs: unify xfs_btree.c with kernel code Dave Chinner
2013-09-30 3:15 ` [PATCH 13/32] libxfs: bmap btree owner swap support Dave Chinner
2013-09-30 3:15 ` [PATCH 14/32] libxfs: xfs_rtalloc.c becomes xfs_rtbitmap.c Dave Chinner
2013-09-30 3:15 ` [PATCH 15/32] libxfs: bring across inode buffer readahead verifier changes Dave Chinner
2013-09-30 3:15 ` [PATCH 16/32] libxfs: Minor cleanup and bug fix sync Dave Chinner
2013-09-30 3:15 ` [PATCH 17/32] db: separate out straight buffer IO from map based IO Dave Chinner
2013-09-30 3:15 ` [PATCH 18/32] db: rewrite bbmap to use xfs_buf_map Dave Chinner
2013-09-30 3:15 ` [PATCH 19/32] db: rewrite IO engine to use libxfs Dave Chinner
2013-09-30 3:15 ` [PATCH 20/32] db: introduce verifier support into set_cur Dave Chinner
2013-09-30 3:15 ` [PATCH 21/32] db: indicate if the CRC on a buffer is correct or not Dave Chinner
2013-09-30 3:15 ` [PATCH 22/32] db: verify and calculate inode CRCs Dave Chinner
2013-09-30 3:15 ` [PATCH 23/32] db: verify and calculate dquot CRCs Dave Chinner
2013-09-30 3:15 ` [PATCH 24/32] db: add a special directory buffer verifier Dave Chinner
2013-09-30 3:15 ` Dave Chinner [this message]
2013-09-30 3:15 ` [PATCH 26/32] db: re-enable write support for v5 filesystems Dave Chinner
2013-09-30 3:15 ` [PATCH 27/32] libxfs: fix root inode handling inconsistencies Dave Chinner
2013-09-30 3:15 ` [PATCH 28/32] xfs_db: avoid libxfs buffer lookup warnings Dave Chinner
2013-09-30 3:15 ` [PATCH 29/32] libxfs: work around do_div() not handling 32 bit numerators Dave Chinner
2013-09-30 3:15 ` [PATCH 30/32] db: enable metadump on CRC filesystems Dave Chinner
2013-09-30 3:15 ` [PATCH 31/32] xfs: support larger inode clusters on v5 filesystems Dave Chinner
2013-09-30 3:15 ` [PATCH 32/32] xfsprogs: kill experimental warnings for " Dave Chinner
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=1380510944-8571-26-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.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