From: Dave Chinner <dchinner@xxxxxxxxxx>
So that version 3 inodes can be handled transparently.
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
db/check.c | 3 ++-
db/metadump.c | 3 ++-
include/xfs_dinode.h | 6 +++---
include/xfs_inode.h | 5 +++--
libxfs/xfs_attr_leaf.c | 6 ++++--
libxfs/xfs_bmap.c | 4 ++--
repair/dinode.c | 8 +++++---
repair/prefetch.c | 3 ++-
8 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/db/check.c b/db/check.c
index 5921779..2a817d8 100644
--- a/db/check.c
+++ b/db/check.c
@@ -2715,7 +2715,8 @@ process_inode(
error++;
return;
}
- if ((unsigned int)XFS_DFORK_ASIZE(dip, mp) >= XFS_LITINO(mp)) {
+ if ((unsigned int)XFS_DFORK_ASIZE(dip, mp) >=
+ XFS_LITINO(mp, dip->di_version)) {
if (v)
dbprintf(_("bad fork offset %d for inode %lld\n"),
idic.di_forkoff, id->ino);
diff --git a/db/metadump.c b/db/metadump.c
index ff534fa..c6cac27 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -1607,7 +1607,8 @@ process_inode(
nametable_clear();
/* copy extended attributes if they exist and forkoff is valid */
- if (success && XFS_DFORK_DSIZE(dip, mp) < XFS_LITINO(mp)) {
+ if (success && XFS_DFORK_DSIZE(dip, mp) <
+ XFS_LITINO(mp, dip->di_version)) {
attr_data.remote_val_count = 0;
switch (dip->di_aformat) {
case XFS_DINODE_FMT_LOCAL:
diff --git a/include/xfs_dinode.h b/include/xfs_dinode.h
index 1d9643b..88a3368 100644
--- a/include/xfs_dinode.h
+++ b/include/xfs_dinode.h
@@ -104,7 +104,7 @@ typedef enum xfs_dinode_fmt {
/*
* Inode size for given fs.
*/
-#define XFS_LITINO(mp) \
+#define XFS_LITINO(mp, version) \
((int)(((mp)->m_sb.sb_inodesize) - sizeof(struct xfs_dinode)))
#define XFS_BROOT_SIZE_ADJ \
@@ -119,10 +119,10 @@ typedef enum xfs_dinode_fmt {
#define XFS_DFORK_DSIZE(dip,mp) \
(XFS_DFORK_Q(dip) ? \
XFS_DFORK_BOFF(dip) : \
- XFS_LITINO(mp))
+ XFS_LITINO(mp, (dip)->di_version))
#define XFS_DFORK_ASIZE(dip,mp) \
(XFS_DFORK_Q(dip) ? \
- XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : \
+ XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \
0)
#define XFS_DFORK_SIZE(dip,mp,w) \
((w) == XFS_DATA_FORK ? \
diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 437b3af..809a8d5 100644
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -180,10 +180,11 @@ typedef struct xfs_icdinode {
#define XFS_IFORK_DSIZE(ip) \
(XFS_IFORK_Q(ip) ? \
XFS_IFORK_BOFF(ip) : \
- XFS_LITINO((ip)->i_mount))
+ XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version))
#define XFS_IFORK_ASIZE(ip) \
(XFS_IFORK_Q(ip) ? \
- XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : \
+ XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version) - \
+ XFS_IFORK_BOFF(ip) : \
0)
#define XFS_IFORK_SIZE(ip,w) \
((w) == XFS_DATA_FORK ? \
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 824c122..426130f 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -141,7 +141,8 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
int dsize;
xfs_mount_t *mp = dp->i_mount;
- offset = (XFS_LITINO(mp) - bytes) >> 3; /* rounded down */
+ /* rounded down */
+ offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3;
switch (dp->i_d.di_format) {
case XFS_DINODE_FMT_DEV:
@@ -212,7 +213,8 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
minforkoff = roundup(minforkoff, 8) >> 3;
/* attr fork btree root can have at least this many key/ptr pairs */
- maxforkoff = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS);
+ maxforkoff = XFS_LITINO(mp, dp->i_d.di_version) -
+ XFS_BMDR_SPACE_CALC(MINABTPTRS);
maxforkoff = maxforkoff >> 3; /* rounded down */
if (offset >= maxforkoff)
diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index b328a0b..26358c8 100644
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3014,13 +3014,13 @@ xfs_default_attroffset(
uint offset;
if (mp->m_sb.sb_inodesize == 256) {
- offset = XFS_LITINO(mp) -
+ offset = XFS_LITINO(mp, ip->i_d.di_version) -
XFS_BMDR_SPACE_CALC(MINABTPTRS);
} else {
offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS);
}
- ASSERT(offset < XFS_LITINO(mp));
+ ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version));
return offset;
}
diff --git a/repair/dinode.c b/repair/dinode.c
index 5a2da39..f564216 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -250,7 +250,8 @@ clear_dinode(xfs_mount_t *mp, xfs_dinode_t *dino, xfs_ino_t ino_num)
/* and clear the forks */
if (dirty && !no_modify)
- memset(XFS_DFORK_DPTR(dino), 0, XFS_LITINO(mp));
+ memset(XFS_DFORK_DPTR(dino), 0,
+ XFS_LITINO(mp, dino->di_version));
return(dirty);
}
@@ -1919,11 +1920,12 @@ _("bad attr fork offset %d in dev inode %" PRIu64 ", should be %d\n"),
case XFS_DINODE_FMT_LOCAL: /* fall through ... */
case XFS_DINODE_FMT_EXTENTS: /* fall through ... */
case XFS_DINODE_FMT_BTREE:
- if (dino->di_forkoff >= (XFS_LITINO(mp) >> 3)) {
+ if (dino->di_forkoff >=
+ (XFS_LITINO(mp, dino->di_version) >> 3)) {
do_warn(
_("bad attr fork offset %d in inode %" PRIu64 ", max=%d\n"),
dino->di_forkoff, lino,
- XFS_LITINO(mp) >> 3);
+ XFS_LITINO(mp, dino->di_version) >> 3);
return 1;
}
break;
diff --git a/repair/prefetch.c b/repair/prefetch.c
index c0b1002..b787663 100644
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -374,7 +374,8 @@ pf_read_inode_dirs(
continue;
if ((dino->di_forkoff != 0) &&
- (dino->di_forkoff >= (XFS_LITINO(mp) >> 3)))
+ (dino->di_forkoff >=
+ (XFS_LITINO(mp, dino->di_version) >> 3)))
continue;
switch (dino->di_format) {
--
1.7.10
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
