Skip to content

L
linux
Commit 7dee2451 authored by Nathan Scott's avatar Nathan Scott
Browse files
Options

[XFS] Sector size updates - macros for calculating address/size of sector-sized 

data structures (sb,agf,agi,agfl) are now sector size aware.  Cleaned up
the early mount code dealing with log devices and logsectsize.

SGI Modid: 2.5.x-xfs:slinx:134065a
parent b95040ee
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 218 deletions
fs/xfs/linux/xfs_super.c
View file @ 7dee2451
...@@ -619,7 +619,7 @@ linvfs_fill_super( ...@@ -619,7 +619,7 @@ linvfs_fill_super(
args = kmalloc(sizeof(struct xfs_mount_args), GFP_KERNEL); args = kmalloc(sizeof(struct xfs_mount_args), GFP_KERNEL);
if (!args) if (!args)
return -EINVAL; return -EINVAL;
memset(args, 0, sizeof(struct xfs_mount_args)); memset(args, 0, sizeof(struct xfs_mount_args));
args->slcount = args->stimeout = args->ctimeout = -1; args->slcount = args->stimeout = args->ctimeout = -1;
strncpy(args->fsname, sb->s_id, MAXNAMELEN); strncpy(args->fsname, sb->s_id, MAXNAMELEN);
...@@ -640,12 +640,13 @@ linvfs_fill_super( ...@@ -640,12 +640,13 @@ linvfs_fill_super(
vfsp->vfs_flag |= VFS_RDONLY; vfsp->vfs_flag |= VFS_RDONLY;
vfsp->vfs_super = sb; vfsp->vfs_super = sb;
set_blocksize(sb->s_bdev, BBSIZE);
set_max_bytes(sb); set_max_bytes(sb);
set_quota_ops(sb); set_quota_ops(sb);
sb->s_op = &linvfs_sops; sb->s_op = &linvfs_sops;
sb->s_export_op = &linvfs_export_ops; sb->s_export_op = &linvfs_export_ops;
sb_min_blocksize(sb, BBSIZE);
LINVFS_SET_VFS(sb, vfsp); LINVFS_SET_VFS(sb, vfsp);
VFSOPS_MOUNT(vfsops, vfsp, args, NULL, error); VFSOPS_MOUNT(vfsops, vfsp, args, NULL, error);
...@@ -767,8 +768,8 @@ STATIC void ...@@ -767,8 +768,8 @@ STATIC void
linvfs_put_super( linvfs_put_super(
struct super_block *sb) struct super_block *sb)
{ {
int error;
vfs_t *vfsp = LINVFS_GET_VFS(sb); vfs_t *vfsp = LINVFS_GET_VFS(sb);
int error;
VFS_DOUNMOUNT(vfsp, 0, NULL, NULL, error); VFS_DOUNMOUNT(vfsp, 0, NULL, NULL, error);
if (error) { if (error) {
......
fs/xfs/xfs_ag.h
View file @ 7dee2451
...@@ -109,12 +109,12 @@ typedef struct xfs_agf ...@@ -109,12 +109,12 @@ typedef struct xfs_agf
#define XFS_AGF_ALL_BITS ((1 << XFS_AGF_NUM_BITS) - 1) #define XFS_AGF_ALL_BITS ((1 << XFS_AGF_NUM_BITS) - 1)
/* disk block (xfs_daddr_t) in the AG */ /* disk block (xfs_daddr_t) in the AG */
#define XFS_AGF_DADDR ((xfs_daddr_t)1) #define XFS_AGF_DADDR(mp) ((xfs_daddr_t)(1 << (mp)->m_sectbb_log))
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGF_BLOCK) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGF_BLOCK)
xfs_agblock_t xfs_agf_block(struct xfs_mount *mp); xfs_agblock_t xfs_agf_block(struct xfs_mount *mp);
#define XFS_AGF_BLOCK(mp) xfs_agf_block(mp) #define XFS_AGF_BLOCK(mp) xfs_agf_block(mp)
#else #else
#define XFS_AGF_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR) #define XFS_AGF_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp))
#endif #endif
/* /*
...@@ -164,29 +164,30 @@ typedef struct xfs_agi ...@@ -164,29 +164,30 @@ typedef struct xfs_agi
#define XFS_AGI_ALL_BITS ((1 << XFS_AGI_NUM_BITS) - 1) #define XFS_AGI_ALL_BITS ((1 << XFS_AGI_NUM_BITS) - 1)
/* disk block (xfs_daddr_t) in the AG */ /* disk block (xfs_daddr_t) in the AG */
#define XFS_AGI_DADDR ((xfs_daddr_t)2) #define XFS_AGI_DADDR(mp) ((xfs_daddr_t)(2 << (mp)->m_sectbb_log))
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGI_BLOCK) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGI_BLOCK)
xfs_agblock_t xfs_agi_block(struct xfs_mount *mp); xfs_agblock_t xfs_agi_block(struct xfs_mount *mp);
#define XFS_AGI_BLOCK(mp) xfs_agi_block(mp) #define XFS_AGI_BLOCK(mp) xfs_agi_block(mp)
#else #else
#define XFS_AGI_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGI_DADDR) #define XFS_AGI_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGI_DADDR(mp))
#endif #endif
/* /*
* The third a.g. block contains the a.g. freelist, an array * The third a.g. block contains the a.g. freelist, an array
* of block pointers to blocks owned by the allocation btree code. * of block pointers to blocks owned by the allocation btree code.
*/ */
#define XFS_AGFL_DADDR ((xfs_daddr_t)3) #define XFS_AGFL_DADDR(mp) ((xfs_daddr_t)(3 << (mp)->m_sectbb_log))
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGFL_BLOCK) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGFL_BLOCK)
xfs_agblock_t xfs_agfl_block(struct xfs_mount *mp); xfs_agblock_t xfs_agfl_block(struct xfs_mount *mp);
#define XFS_AGFL_BLOCK(mp) xfs_agfl_block(mp) #define XFS_AGFL_BLOCK(mp) xfs_agfl_block(mp)
#else #else
#define XFS_AGFL_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR) #define XFS_AGFL_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp))
#endif #endif
#define XFS_AGFL_SIZE (BBSIZE / sizeof(xfs_agblock_t)) #define XFS_AGFL_SIZE(mp) ((mp)->m_sb.sb_sectsize / sizeof(xfs_agblock_t))
typedef struct xfs_agfl
{ /* -- nathans TODO ... use of BBSIZE here - should be sector size -- */
xfs_agblock_t agfl_bno[XFS_AGFL_SIZE]; typedef struct xfs_agfl {
xfs_agblock_t agfl_bno[BBSIZE/sizeof(xfs_agblock_t)];
} xfs_agfl_t; } xfs_agfl_t;
/* /*
...@@ -244,15 +245,15 @@ xfs_extlen_t xfs_ag_min_blocks(int bl); ...@@ -244,15 +245,15 @@ xfs_extlen_t xfs_ag_min_blocks(int bl);
xfs_extlen_t xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks); xfs_extlen_t xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks);
#define XFS_AG_BEST_BLOCKS(bl,blks) xfs_ag_best_blocks(bl,blks) #define XFS_AG_BEST_BLOCKS(bl,blks) xfs_ag_best_blocks(bl,blks)
#else #else
/*--#define XFS_AG_BEST_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl))*/ /*--#define XFS_AG_BEST_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl))*/
/* /*
* Best is XFS_AG_BEST_BLOCKS at and below 64 Gigabyte filesystems, and * Best is XFS_AG_BEST_BLOCKS at and below 64 Gigabyte filesystems, and
* XFS_AG_MAX_BLOCKS above 64 Gigabytes. * XFS_AG_MAX_BLOCKS above 64 Gigabytes.
*/ */
#define XFS_AG_BEST_BLOCKS(bl,blks) ((xfs_extlen_t)((1LL << (36 - bl)) >= \ #define XFS_AG_BEST_BLOCKS(bl,blks) \
blks) ? \ ((xfs_extlen_t)((1LL << (36 - bl)) >= blks) ? \
((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl)) : \ ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl)) : \
XFS_AG_MAX_BLOCKS(bl)) XFS_AG_MAX_BLOCKS(bl))
#endif #endif
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAX_BLOCKS) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAX_BLOCKS)
xfs_extlen_t xfs_ag_max_blocks(int bl); xfs_extlen_t xfs_ag_max_blocks(int bl);
...@@ -320,7 +321,7 @@ xfs_agblock_t xfs_fsb_to_agbno(struct xfs_mount *mp, xfs_fsblock_t fsbno); ...@@ -320,7 +321,7 @@ xfs_agblock_t xfs_fsb_to_agbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGB_TO_DADDR) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGB_TO_DADDR)
xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno,
xfs_agblock_t agbno); xfs_agblock_t agbno);
#define XFS_AGB_TO_DADDR(mp,agno,agbno) xfs_agb_to_daddr(mp,agno,agbno) #define XFS_AGB_TO_DADDR(mp,agno,agbno) xfs_agb_to_daddr(mp,agno,agbno)
#else #else
#define XFS_AGB_TO_DADDR(mp,agno,agbno) \ #define XFS_AGB_TO_DADDR(mp,agno,agbno) \
...@@ -333,7 +334,8 @@ xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, ...@@ -333,7 +334,8 @@ xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno,
*/ */
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_DADDR) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_DADDR)
xfs_daddr_t xfs_ag_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_daddr_t d); xfs_daddr_t xfs_ag_daddr(struct xfs_mount *mp, xfs_agnumber_t agno,
xfs_daddr_t d);
#define XFS_AG_DADDR(mp,agno,d) xfs_ag_daddr(mp,agno,d) #define XFS_AG_DADDR(mp,agno,d) xfs_ag_daddr(mp,agno,d)
#else #else
#define XFS_AG_DADDR(mp,agno,d) (XFS_AGB_TO_DADDR(mp, agno, 0) + (d)) #define XFS_AG_DADDR(mp,agno,d) (XFS_AGB_TO_DADDR(mp, agno, 0) + (d))
......
fs/xfs/xfs_alloc.c
View file @ 7dee2451
...@@ -399,12 +399,14 @@ xfs_alloc_read_agfl( ...@@ -399,12 +399,14 @@ xfs_alloc_read_agfl(
xfs_buf_t **bpp) /* buffer for the ag free block array */ xfs_buf_t **bpp) /* buffer for the ag free block array */
{ {
xfs_buf_t *bp; /* return value */ xfs_buf_t *bp; /* return value */
xfs_daddr_t d; /* disk block address */
int error; int error;
ASSERT(agno != NULLAGNUMBER); ASSERT(agno != NULLAGNUMBER);
d = XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR); error = xfs_trans_read_buf(
if ((error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d, 1, 0, &bp))) mp, tp, mp->m_ddev_targp,
XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR(mp)),
XFS_FSS_TO_BB(mp, 1), 0, &bp);
if (error)
return error; return error;
ASSERT(bp); ASSERT(bp);
ASSERT(!XFS_BUF_GETERROR(bp)); ASSERT(!XFS_BUF_GETERROR(bp));
...@@ -1821,9 +1823,8 @@ xfs_alloc_compute_maxlevels( ...@@ -1821,9 +1823,8 @@ xfs_alloc_compute_maxlevels(
/* /*
* Decide whether to use this allocation group for this allocation. * Decide whether to use this allocation group for this allocation.
* If so, fix up the btree freelist's size. * If so, fix up the btree freelist's size.
* This is external so mkfs can call it, too.
*/ */
int /* error */ STATIC int /* error */
xfs_alloc_fix_freelist( xfs_alloc_fix_freelist(
xfs_alloc_arg_t *args, /* allocation argument structure */ xfs_alloc_arg_t *args, /* allocation argument structure */
int flags) /* XFS_ALLOC_FLAG_... */ int flags) /* XFS_ALLOC_FLAG_... */
...@@ -2020,7 +2021,7 @@ xfs_alloc_get_freelist( ...@@ -2020,7 +2021,7 @@ xfs_alloc_get_freelist(
bno = INT_GET(agfl->agfl_bno[INT_GET(agf->agf_flfirst, ARCH_CONVERT)], ARCH_CONVERT); bno = INT_GET(agfl->agfl_bno[INT_GET(agf->agf_flfirst, ARCH_CONVERT)], ARCH_CONVERT);
INT_MOD(agf->agf_flfirst, ARCH_CONVERT, 1); INT_MOD(agf->agf_flfirst, ARCH_CONVERT, 1);
xfs_trans_brelse(tp, agflbp); xfs_trans_brelse(tp, agflbp);
if (INT_GET(agf->agf_flfirst, ARCH_CONVERT) == XFS_AGFL_SIZE) if (INT_GET(agf->agf_flfirst, ARCH_CONVERT) == XFS_AGFL_SIZE(mp))
INT_ZERO(agf->agf_flfirst, ARCH_CONVERT); INT_ZERO(agf->agf_flfirst, ARCH_CONVERT);
pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)]; pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)];
INT_MOD(agf->agf_flcount, ARCH_CONVERT, -1); INT_MOD(agf->agf_flcount, ARCH_CONVERT, -1);
...@@ -2120,13 +2121,13 @@ xfs_alloc_put_freelist( ...@@ -2120,13 +2121,13 @@ xfs_alloc_put_freelist(
return error; return error;
agfl = XFS_BUF_TO_AGFL(agflbp); agfl = XFS_BUF_TO_AGFL(agflbp);
INT_MOD(agf->agf_fllast, ARCH_CONVERT, 1); INT_MOD(agf->agf_fllast, ARCH_CONVERT, 1);
if (INT_GET(agf->agf_fllast, ARCH_CONVERT) == XFS_AGFL_SIZE) if (INT_GET(agf->agf_fllast, ARCH_CONVERT) == XFS_AGFL_SIZE(mp))
INT_ZERO(agf->agf_fllast, ARCH_CONVERT); INT_ZERO(agf->agf_fllast, ARCH_CONVERT);
pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)]; pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)];
INT_MOD(agf->agf_flcount, ARCH_CONVERT, 1); INT_MOD(agf->agf_flcount, ARCH_CONVERT, 1);
xfs_trans_agflist_delta(tp, 1); xfs_trans_agflist_delta(tp, 1);
pag->pagf_flcount++; pag->pagf_flcount++;
ASSERT(INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE); ASSERT(INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE(mp));
blockp = &agfl->agfl_bno[INT_GET(agf->agf_fllast, ARCH_CONVERT)]; blockp = &agfl->agfl_bno[INT_GET(agf->agf_fllast, ARCH_CONVERT)];
INT_SET(*blockp, ARCH_CONVERT, bno); INT_SET(*blockp, ARCH_CONVERT, bno);
TRACE_MODAGF(NULL, agf, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT); TRACE_MODAGF(NULL, agf, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT);
...@@ -2152,15 +2153,17 @@ xfs_alloc_read_agf( ...@@ -2152,15 +2153,17 @@ xfs_alloc_read_agf(
xfs_agf_t *agf; /* ag freelist header */ xfs_agf_t *agf; /* ag freelist header */
int agf_ok; /* set if agf is consistent */ int agf_ok; /* set if agf is consistent */
xfs_buf_t *bp; /* return value */ xfs_buf_t *bp; /* return value */
xfs_daddr_t d; /* disk block address */
int error;
xfs_perag_t *pag; /* per allocation group data */ xfs_perag_t *pag; /* per allocation group data */
int error;
ASSERT(agno != NULLAGNUMBER); ASSERT(agno != NULLAGNUMBER);
d = XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR); error = xfs_trans_read_buf(
if ((error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d, 1, mp, tp, mp->m_ddev_targp,
XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
XFS_FSS_TO_BB(mp, 1),
(flags & XFS_ALLOC_FLAG_TRYLOCK) ? XFS_BUF_TRYLOCK : 0U, (flags & XFS_ALLOC_FLAG_TRYLOCK) ? XFS_BUF_TRYLOCK : 0U,
&bp))) &bp);
if (error)
return error; return error;
ASSERT(!bp || !XFS_BUF_GETERROR(bp)); ASSERT(!bp || !XFS_BUF_GETERROR(bp));
if (!bp) { if (!bp) {
...@@ -2173,12 +2176,13 @@ xfs_alloc_read_agf( ...@@ -2173,12 +2176,13 @@ xfs_alloc_read_agf(
agf = XFS_BUF_TO_AGF(bp); agf = XFS_BUF_TO_AGF(bp);
agf_ok = agf_ok =
INT_GET(agf->agf_magicnum, ARCH_CONVERT) == XFS_AGF_MAGIC && INT_GET(agf->agf_magicnum, ARCH_CONVERT) == XFS_AGF_MAGIC &&
XFS_AGF_GOOD_VERSION(INT_GET(agf->agf_versionnum, ARCH_CONVERT)) && XFS_AGF_GOOD_VERSION(
INT_GET(agf->agf_versionnum, ARCH_CONVERT)) &&
INT_GET(agf->agf_freeblks, ARCH_CONVERT) <= INT_GET(agf->agf_freeblks, ARCH_CONVERT) <=
INT_GET(agf->agf_length, ARCH_CONVERT) && INT_GET(agf->agf_length, ARCH_CONVERT) &&
INT_GET(agf->agf_flfirst, ARCH_CONVERT) < XFS_AGFL_SIZE && INT_GET(agf->agf_flfirst, ARCH_CONVERT) < XFS_AGFL_SIZE(mp) &&
INT_GET(agf->agf_fllast, ARCH_CONVERT) < XFS_AGFL_SIZE && INT_GET(agf->agf_fllast, ARCH_CONVERT) < XFS_AGFL_SIZE(mp) &&
INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE; INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE(mp);
if (XFS_TEST_ERROR(!agf_ok, mp, XFS_ERRTAG_ALLOC_READ_AGF, if (XFS_TEST_ERROR(!agf_ok, mp, XFS_ERRTAG_ALLOC_READ_AGF,
XFS_RANDOM_ALLOC_READ_AGF)) { XFS_RANDOM_ALLOC_READ_AGF)) {
xfs_trans_brelse(tp, bp); xfs_trans_brelse(tp, bp);
...@@ -2197,13 +2201,13 @@ xfs_alloc_read_agf( ...@@ -2197,13 +2201,13 @@ xfs_alloc_read_agf(
cmn_err(CE_NOTE, "Bad freeblks %d %d", cmn_err(CE_NOTE, "Bad freeblks %d %d",
INT_GET(agf->agf_freeblks, ARCH_CONVERT), INT_GET(agf->agf_freeblks, ARCH_CONVERT),
INT_GET(agf->agf_length, ARCH_CONVERT)); INT_GET(agf->agf_length, ARCH_CONVERT));
if (!(INT_GET(agf->agf_flfirst, ARCH_CONVERT) < XFS_AGFL_SIZE)) if (!(INT_GET(agf->agf_flfirst, ARCH_CONVERT) < XFS_AGFL_SIZE(mp)))
cmn_err(CE_NOTE, "Bad flfirst %d", cmn_err(CE_NOTE, "Bad flfirst %d",
INT_GET(agf->agf_flfirst, ARCH_CONVERT)); INT_GET(agf->agf_flfirst, ARCH_CONVERT));
if (!(INT_GET(agf->agf_fllast, ARCH_CONVERT) < XFS_AGFL_SIZE)) if (!(INT_GET(agf->agf_fllast, ARCH_CONVERT) < XFS_AGFL_SIZE(mp)))
cmn_err(CE_NOTE, "Bad fllast %d", cmn_err(CE_NOTE, "Bad fllast %d",
INT_GET(agf->agf_fllast, ARCH_CONVERT)); INT_GET(agf->agf_fllast, ARCH_CONVERT));
if (!(INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE)) if (!(INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE(mp)))
cmn_err(CE_NOTE, "Bad flcount %d", cmn_err(CE_NOTE, "Bad flcount %d",
INT_GET(agf->agf_flcount, ARCH_CONVERT)); INT_GET(agf->agf_flcount, ARCH_CONVERT));
#endif #endif
......
fs/xfs/xfs_alloc.h
View file @ 7dee2451
...@@ -130,16 +130,6 @@ void ...@@ -130,16 +130,6 @@ void
xfs_alloc_compute_maxlevels( xfs_alloc_compute_maxlevels(
struct xfs_mount *mp); /* file system mount structure */ struct xfs_mount *mp); /* file system mount structure */
/*
* Decide whether to use this allocation group for this allocation.
* If so, fix up the btree freelist's size.
* This is external so mkfs can call it, too.
*/
int /* error */
xfs_alloc_fix_freelist(
xfs_alloc_arg_t *args, /* allocation argument structure */
int flags); /* XFS_ALLOC_FLAG_... */
/* /*
* Get a block from the freelist. * Get a block from the freelist.
* Returns with the buffer for the block gotten. * Returns with the buffer for the block gotten.
......
fs/xfs/xfs_fs.h
View file @ 7dee2451
...@@ -225,15 +225,16 @@ typedef struct xfs_fsop_resblks { ...@@ -225,15 +225,16 @@ typedef struct xfs_fsop_resblks {
#define XFS_FSOP_GEOM_VERSION 0 #define XFS_FSOP_GEOM_VERSION 0
#define XFS_FSOP_GEOM_FLAGS_ATTR 0x01 /* attributes in use */ #define XFS_FSOP_GEOM_FLAGS_ATTR 0x0001 /* attributes in use */
#define XFS_FSOP_GEOM_FLAGS_NLINK 0x02 /* 32-bit nlink values */ #define XFS_FSOP_GEOM_FLAGS_NLINK 0x0002 /* 32-bit nlink values */
#define XFS_FSOP_GEOM_FLAGS_QUOTA 0x04 /* quotas enabled */ #define XFS_FSOP_GEOM_FLAGS_QUOTA 0x0004 /* quotas enabled */
#define XFS_FSOP_GEOM_FLAGS_IALIGN 0x08 /* inode alignment */ #define XFS_FSOP_GEOM_FLAGS_IALIGN 0x0008 /* inode alignment */
#define XFS_FSOP_GEOM_FLAGS_DALIGN 0x10 /* large data alignment */ #define XFS_FSOP_GEOM_FLAGS_DALIGN 0x0010 /* large data alignment */
#define XFS_FSOP_GEOM_FLAGS_SHARED 0x20 /* read-only shared */ #define XFS_FSOP_GEOM_FLAGS_SHARED 0x0020 /* read-only shared */
#define XFS_FSOP_GEOM_FLAGS_EXTFLG 0x40 /* special extent flag */ #define XFS_FSOP_GEOM_FLAGS_EXTFLG 0x0040 /* special extent flag */
#define XFS_FSOP_GEOM_FLAGS_DIRV2 0x80 /* directory version 2 */ #define XFS_FSOP_GEOM_FLAGS_DIRV2 0x0080 /* directory version 2 */
#define XFS_FSOP_GEOM_FLAGS_LOGV2 0x100 /* log format version 2 */ #define XFS_FSOP_GEOM_FLAGS_LOGV2 0x0100 /* log format version 2 */
#define XFS_FSOP_GEOM_FLAGS_SECTOR 0x0200 /* sector sizes >1BB */
/* /*
......
fs/xfs/xfs_fsops.c
View file @ 7dee2451
...@@ -78,9 +78,12 @@ xfs_fs_geometry( ...@@ -78,9 +78,12 @@ xfs_fs_geometry(
(XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) ? (XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) ?
XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) | XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) |
(XFS_SB_VERSION_HASDIRV2(&mp->m_sb) ? (XFS_SB_VERSION_HASDIRV2(&mp->m_sb) ?
XFS_FSOP_GEOM_FLAGS_DIRV2 : 0); XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) |
geo->logsectsize = mp->m_sb.sb_sectsize; /* XXX */ (XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ?
geo->rtsectsize = mp->m_sb.sb_sectsize; /* XXX */ XFS_FSOP_GEOM_FLAGS_SECTOR : 0);
geo->logsectsize = XFS_SB_VERSION_HASSECTOR(&mp->m_sb) ?
mp->m_sb.sb_logsectsize : BBSIZE;
geo->rtsectsize = mp->m_sb.sb_blocksize;
geo->dirblocksize = mp->m_dirblksize; geo->dirblocksize = mp->m_dirblksize;
} }
if (new_version >= 4) { if (new_version >= 4) {
...@@ -105,9 +108,7 @@ xfs_growfs_data_private( ...@@ -105,9 +108,7 @@ xfs_growfs_data_private(
xfs_alloc_rec_t *arec; xfs_alloc_rec_t *arec;
xfs_btree_sblock_t *block; xfs_btree_sblock_t *block;
xfs_buf_t *bp; xfs_buf_t *bp;
int bsize;
int bucket; int bucket;
xfs_daddr_t disk_addr;
int dpct; int dpct;
int error; int error;
xfs_agnumber_t nagcount; xfs_agnumber_t nagcount;
...@@ -117,7 +118,6 @@ xfs_growfs_data_private( ...@@ -117,7 +118,6 @@ xfs_growfs_data_private(
xfs_agnumber_t oagcount; xfs_agnumber_t oagcount;
int pct; int pct;
xfs_sb_t *sbp; xfs_sb_t *sbp;
int sectbb;
xfs_trans_t *tp; xfs_trans_t *tp;
nb = in->newblocks; nb = in->newblocks;
...@@ -125,8 +125,9 @@ xfs_growfs_data_private( ...@@ -125,8 +125,9 @@ xfs_growfs_data_private(
if (nb < mp->m_sb.sb_dblocks || pct < 0 || pct > 100) if (nb < mp->m_sb.sb_dblocks || pct < 0 || pct > 100)
return XFS_ERROR(EINVAL); return XFS_ERROR(EINVAL);
dpct = pct - mp->m_sb.sb_imax_pct; dpct = pct - mp->m_sb.sb_imax_pct;
error = xfs_read_buf(mp, mp->m_ddev_targp, XFS_FSB_TO_BB(mp, nb) - 1, 1, error = xfs_read_buf(mp, mp->m_ddev_targp,
0, &bp); XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1),
XFS_FSS_TO_BB(mp, 1), 0, &bp);
if (error) if (error)
return error; return error;
ASSERT(bp); ASSERT(bp);
...@@ -161,19 +162,15 @@ xfs_growfs_data_private( ...@@ -161,19 +162,15 @@ xfs_growfs_data_private(
xfs_trans_cancel(tp, 0); xfs_trans_cancel(tp, 0);
return error; return error;
} }
/* new ag's */
sectbb = BTOBB(mp->m_sb.sb_sectsize);
bsize = mp->m_sb.sb_blocksize;
nfree = 0; nfree = 0;
for (agno = nagcount - 1; agno >= oagcount; agno--, new -= agsize) { for (agno = nagcount - 1; agno >= oagcount; agno--, new -= agsize) {
/* /*
* AG freelist header block * AG freelist header block
*/ */
disk_addr = XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR);
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
disk_addr, XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
sectbb, 0); XFS_FSS_TO_BB(mp, 1), 0);
agf = XFS_BUF_TO_AGF(bp); agf = XFS_BUF_TO_AGF(bp);
memset(agf, 0, mp->m_sb.sb_sectsize); memset(agf, 0, mp->m_sb.sb_sectsize);
INT_SET(agf->agf_magicnum, ARCH_CONVERT, XFS_AGF_MAGIC); INT_SET(agf->agf_magicnum, ARCH_CONVERT, XFS_AGF_MAGIC);
...@@ -186,12 +183,14 @@ xfs_growfs_data_private( ...@@ -186,12 +183,14 @@ xfs_growfs_data_private(
else else
agsize = mp->m_sb.sb_agblocks; agsize = mp->m_sb.sb_agblocks;
INT_SET(agf->agf_length, ARCH_CONVERT, agsize); INT_SET(agf->agf_length, ARCH_CONVERT, agsize);
INT_SET(agf->agf_roots[XFS_BTNUM_BNOi], ARCH_CONVERT, XFS_BNO_BLOCK(mp)); INT_SET(agf->agf_roots[XFS_BTNUM_BNOi], ARCH_CONVERT,
INT_SET(agf->agf_roots[XFS_BTNUM_CNTi], ARCH_CONVERT, XFS_CNT_BLOCK(mp)); XFS_BNO_BLOCK(mp));
INT_SET(agf->agf_roots[XFS_BTNUM_CNTi], ARCH_CONVERT,
XFS_CNT_BLOCK(mp));
INT_SET(agf->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT, 1); INT_SET(agf->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT, 1);
INT_SET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT, 1); INT_SET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT, 1);
INT_ZERO(agf->agf_flfirst, ARCH_CONVERT); INT_ZERO(agf->agf_flfirst, ARCH_CONVERT);
INT_SET(agf->agf_fllast, ARCH_CONVERT, XFS_AGFL_SIZE - 1); INT_SET(agf->agf_fllast, ARCH_CONVERT, XFS_AGFL_SIZE(mp) - 1);
INT_ZERO(agf->agf_flcount, ARCH_CONVERT); INT_ZERO(agf->agf_flcount, ARCH_CONVERT);
tmpsize = agsize - XFS_PREALLOC_BLOCKS(mp); tmpsize = agsize - XFS_PREALLOC_BLOCKS(mp);
INT_SET(agf->agf_freeblks, ARCH_CONVERT, tmpsize); INT_SET(agf->agf_freeblks, ARCH_CONVERT, tmpsize);
...@@ -203,10 +202,9 @@ xfs_growfs_data_private( ...@@ -203,10 +202,9 @@ xfs_growfs_data_private(
/* /*
* AG inode header block * AG inode header block
*/ */
disk_addr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR);
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
disk_addr, XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
sectbb, 0); XFS_FSS_TO_BB(mp, 1), 0);
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
memset(agi, 0, mp->m_sb.sb_sectsize); memset(agi, 0, mp->m_sb.sb_sectsize);
INT_SET(agi->agi_magicnum, ARCH_CONVERT, XFS_AGI_MAGIC); INT_SET(agi->agi_magicnum, ARCH_CONVERT, XFS_AGI_MAGIC);
...@@ -220,7 +218,8 @@ xfs_growfs_data_private( ...@@ -220,7 +218,8 @@ xfs_growfs_data_private(
INT_SET(agi->agi_newino, ARCH_CONVERT, NULLAGINO); INT_SET(agi->agi_newino, ARCH_CONVERT, NULLAGINO);
INT_SET(agi->agi_dirino, ARCH_CONVERT, NULLAGINO); INT_SET(agi->agi_dirino, ARCH_CONVERT, NULLAGINO);
for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++)
INT_SET(agi->agi_unlinked[bucket], ARCH_CONVERT, NULLAGINO); INT_SET(agi->agi_unlinked[bucket], ARCH_CONVERT,
NULLAGINO);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
...@@ -228,21 +227,22 @@ xfs_growfs_data_private( ...@@ -228,21 +227,22 @@ xfs_growfs_data_private(
/* /*
* BNO btree root block * BNO btree root block
*/ */
disk_addr = XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp));
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
disk_addr, XFS_AGB_TO_DADDR(mp, agno, XFS_BNO_BLOCK(mp)),
BTOBB(bsize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, bsize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTB_MAGIC); INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTB_MAGIC);
INT_ZERO(block->bb_level, ARCH_CONVERT); INT_ZERO(block->bb_level, ARCH_CONVERT);
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); INT_SET(block->bb_numrecs, ARCH_CONVERT, 1);
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK);
arec = XFS_BTREE_REC_ADDR(bsize, xfs_alloc, block, 1, arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc,
mp->m_alloc_mxr[0]); block, 1, mp->m_alloc_mxr[0]);
INT_SET(arec->ar_startblock, ARCH_CONVERT, XFS_PREALLOC_BLOCKS(mp)); INT_SET(arec->ar_startblock, ARCH_CONVERT,
INT_SET(arec->ar_blockcount, ARCH_CONVERT, agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT)); XFS_PREALLOC_BLOCKS(mp));
INT_SET(arec->ar_blockcount, ARCH_CONVERT,
agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT));
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
...@@ -250,21 +250,22 @@ xfs_growfs_data_private( ...@@ -250,21 +250,22 @@ xfs_growfs_data_private(
/* /*
* CNT btree root block * CNT btree root block
*/ */
disk_addr = XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp));
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
disk_addr, XFS_AGB_TO_DADDR(mp, agno, XFS_CNT_BLOCK(mp)),
BTOBB(bsize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, bsize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTC_MAGIC); INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTC_MAGIC);
INT_ZERO(block->bb_level, ARCH_CONVERT); INT_ZERO(block->bb_level, ARCH_CONVERT);
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); INT_SET(block->bb_numrecs, ARCH_CONVERT, 1);
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK);
arec = XFS_BTREE_REC_ADDR(bsize, xfs_alloc, block, 1, arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc,
mp->m_alloc_mxr[0]); block, 1, mp->m_alloc_mxr[0]);
INT_SET(arec->ar_startblock, ARCH_CONVERT, XFS_PREALLOC_BLOCKS(mp)); INT_SET(arec->ar_startblock, ARCH_CONVERT,
INT_SET(arec->ar_blockcount, ARCH_CONVERT, agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT)); XFS_PREALLOC_BLOCKS(mp));
INT_SET(arec->ar_blockcount, ARCH_CONVERT,
agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT));
nfree += INT_GET(arec->ar_blockcount, ARCH_CONVERT); nfree += INT_GET(arec->ar_blockcount, ARCH_CONVERT);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
...@@ -273,12 +274,11 @@ xfs_growfs_data_private( ...@@ -273,12 +274,11 @@ xfs_growfs_data_private(
/* /*
* INO btree root block * INO btree root block
*/ */
disk_addr = XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp));
bp = xfs_buf_get(mp->m_ddev_targp, bp = xfs_buf_get(mp->m_ddev_targp,
disk_addr, XFS_AGB_TO_DADDR(mp, agno, XFS_IBT_BLOCK(mp)),
BTOBB(bsize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, bsize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_IBT_MAGIC); INT_SET(block->bb_magic, ARCH_CONVERT, XFS_IBT_MAGIC);
INT_ZERO(block->bb_level, ARCH_CONVERT); INT_ZERO(block->bb_level, ARCH_CONVERT);
INT_ZERO(block->bb_numrecs, ARCH_CONVERT); INT_ZERO(block->bb_numrecs, ARCH_CONVERT);
...@@ -304,8 +304,9 @@ xfs_growfs_data_private( ...@@ -304,8 +304,9 @@ xfs_growfs_data_private(
ASSERT(bp); ASSERT(bp);
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
INT_MOD(agi->agi_length, ARCH_CONVERT, new); INT_MOD(agi->agi_length, ARCH_CONVERT, new);
ASSERT(nagcount == oagcount ASSERT(nagcount == oagcount ||
|| INT_GET(agi->agi_length, ARCH_CONVERT) == mp->m_sb.sb_agblocks); INT_GET(agi->agi_length, ARCH_CONVERT) ==
mp->m_sb.sb_agblocks);
xfs_ialloc_log_agi(tp, bp, XFS_AGI_LENGTH); xfs_ialloc_log_agi(tp, bp, XFS_AGI_LENGTH);
/* /*
* Change agf length. * Change agf length.
...@@ -323,7 +324,7 @@ xfs_growfs_data_private( ...@@ -323,7 +324,7 @@ xfs_growfs_data_private(
* Free the new space. * Free the new space.
*/ */
error = xfs_free_extent(tp, XFS_AGB_TO_FSB(mp, agno, error = xfs_free_extent(tp, XFS_AGB_TO_FSB(mp, agno,
INT_GET(agf->agf_length, ARCH_CONVERT) - new), new); INT_GET(agf->agf_length, ARCH_CONVERT) - new), new);
if (error) { if (error) {
goto error0; goto error0;
} }
...@@ -350,7 +351,7 @@ xfs_growfs_data_private( ...@@ -350,7 +351,7 @@ xfs_growfs_data_private(
for (agno = 1; agno < nagcount; agno++) { for (agno = 1; agno < nagcount; agno++) {
error = xfs_read_buf(mp, mp->m_ddev_targp, error = xfs_read_buf(mp, mp->m_ddev_targp,
XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)), XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)),
sectbb, 0, &bp); XFS_FSS_TO_BB(mp, 1), 0, &bp);
if (error) { if (error) {
xfs_fs_cmn_err(CE_WARN, mp, xfs_fs_cmn_err(CE_WARN, mp,
"error %d reading secondary superblock for ag %d", "error %d reading secondary superblock for ag %d",
...@@ -585,7 +586,6 @@ xfs_fs_freeze( ...@@ -585,7 +586,6 @@ xfs_fs_freeze(
return 0; return 0;
} }
int int
xfs_fs_thaw( xfs_fs_thaw(
xfs_mount_t *mp) xfs_mount_t *mp)
......
fs/xfs/xfs_ialloc.c
View file @ 7dee2451
...@@ -1258,8 +1258,7 @@ xfs_ialloc_log_agi( ...@@ -1258,8 +1258,7 @@ xfs_ialloc_log_agi(
xfs_agi_t *agi; /* allocation group header */ xfs_agi_t *agi; /* allocation group header */
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC);
XFS_AGI_MAGIC);
#endif #endif
/* /*
* Compute byte offsets for the first and last fields. * Compute byte offsets for the first and last fields.
...@@ -1284,26 +1283,26 @@ xfs_ialloc_read_agi( ...@@ -1284,26 +1283,26 @@ xfs_ialloc_read_agi(
xfs_agi_t *agi; /* allocation group header */ xfs_agi_t *agi; /* allocation group header */
int agi_ok; /* agi is consistent */ int agi_ok; /* agi is consistent */
xfs_buf_t *bp; /* allocation group hdr buf */ xfs_buf_t *bp; /* allocation group hdr buf */
xfs_daddr_t d; /* disk block address */
int error;
#ifdef DEBUG
int i;
#endif
xfs_perag_t *pag; /* per allocation group data */ xfs_perag_t *pag; /* per allocation group data */
int error;
ASSERT(agno != NULLAGNUMBER); ASSERT(agno != NULLAGNUMBER);
d = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); error = xfs_trans_read_buf(
if ((error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d, 1, 0, &bp))) mp, tp, mp->m_ddev_targp,
XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
XFS_FSS_TO_BB(mp, 1), 0, &bp);
if (error)
return error; return error;
ASSERT(bp && !XFS_BUF_GETERROR(bp)); ASSERT(bp && !XFS_BUF_GETERROR(bp));
/* /*
* Validate the magic number of the agi block. * Validate the magic number of the agi block.
*/ */
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
agi_ok = agi_ok =
INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC && INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC &&
XFS_AGI_GOOD_VERSION(INT_GET(agi->agi_versionnum, ARCH_CONVERT)); XFS_AGI_GOOD_VERSION(
INT_GET(agi->agi_versionnum, ARCH_CONVERT));
if (XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IALLOC_READ_AGI, if (XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IALLOC_READ_AGI,
XFS_RANDOM_IALLOC_READ_AGI)) { XFS_RANDOM_IALLOC_READ_AGI)) {
xfs_trans_brelse(tp, bp); xfs_trans_brelse(tp, bp);
...@@ -1323,13 +1322,20 @@ xfs_ialloc_read_agi( ...@@ -1323,13 +1322,20 @@ xfs_ialloc_read_agi(
* It's possible for these to be out of sync if * It's possible for these to be out of sync if
* we are in the middle of a forced shutdown. * we are in the middle of a forced shutdown.
*/ */
ASSERT(pag->pagi_freecount == INT_GET(agi->agi_freecount, ARCH_CONVERT) ASSERT(pag->pagi_freecount ==
INT_GET(agi->agi_freecount, ARCH_CONVERT)
|| XFS_FORCED_SHUTDOWN(mp)); || XFS_FORCED_SHUTDOWN(mp));
} }
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++) {
ASSERT(!INT_ISZERO(agi->agi_unlinked[i], ARCH_CONVERT)); int i;
for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++)
ASSERT(!INT_ISZERO(agi->agi_unlinked[i], ARCH_CONVERT));
}
#endif #endif
XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGI, XFS_AGI_REF); XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGI, XFS_AGI_REF);
*bpp = bp; *bpp = bp;
return 0; return 0;
......
fs/xfs/xfs_ialloc_btree.c
View file @ 7dee2451
...@@ -213,10 +213,10 @@ xfs_inobt_delrec( ...@@ -213,10 +213,10 @@ xfs_inobt_delrec(
*/ */
agfbno = XFS_AG_DADDR(cur->bc_mp, agfbno = XFS_AG_DADDR(cur->bc_mp,
cur->bc_private.i.agno, cur->bc_private.i.agno,
XFS_AGF_DADDR); XFS_AGF_DADDR(mp));
if (error = xfs_trans_read_buf(cur->bc_mp, cur->bc_tp, if (error = xfs_trans_read_buf(cur->bc_mp, cur->bc_tp,
cur->bc_mp->m_ddev_targp, agfbno, 1, 0, cur->bc_mp->m_ddev_targp, agfbno,
&agfbp)) XFS_FSS_TO_BB(mp, 1), 0, &agfbp))
return error; return error;
ASSERT(!XFS_BUF_GETERROR(agfbp)); ASSERT(!XFS_BUF_GETERROR(agfbp));
xfs_trans_bhold_until_committed(cur->bc_tp, agfbp); xfs_trans_bhold_until_committed(cur->bc_tp, agfbp);
...@@ -506,9 +506,10 @@ xfs_inobt_delrec( ...@@ -506,9 +506,10 @@ xfs_inobt_delrec(
* transaction record makes it to the on-disk log. * transaction record makes it to the on-disk log.
*/ */
agfbno = XFS_AG_DADDR(cur->bc_mp, cur->bc_private.i.agno, agfbno = XFS_AG_DADDR(cur->bc_mp, cur->bc_private.i.agno,
XFS_AGF_DADDR); XFS_AGF_DADDR(mp));
if (error = xfs_trans_read_buf(cur->bc_mp, cur->bc_tp, if (error = xfs_trans_read_buf(cur->bc_mp, cur->bc_tp,
cur->bc_mp->m_ddev_targp, agfbno, 1, 0, &agfbp)) cur->bc_mp->m_ddev_targp, agfbno,
XFS_FSS_TO_BB(mp, 1), 0, &agfbp))
return error; return error;
ASSERT(!XFS_BUF_GETERROR(agfbp)); ASSERT(!XFS_BUF_GETERROR(agfbp));
xfs_trans_bhold_until_committed(cur->bc_tp, agfbp); xfs_trans_bhold_until_committed(cur->bc_tp, agfbp);
......
fs/xfs/xfs_inode.c
View file @ 7dee2451
...@@ -1799,14 +1799,14 @@ xfs_iunlink( ...@@ -1799,14 +1799,14 @@ xfs_iunlink(
mp = tp->t_mountp; mp = tp->t_mountp;
agno = XFS_INO_TO_AGNO(mp, ip->i_ino); agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
agdaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); agdaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp));
/* /*
* Get the agi buffer first. It ensures lock ordering * Get the agi buffer first. It ensures lock ordering
* on the list. * on the list.
*/ */
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, agdaddr, error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, agdaddr,
1, 0, &agibp); XFS_FSS_TO_BB(mp, 1), 0, &agibp);
if (error) { if (error) {
return error; return error;
} }
...@@ -1898,15 +1898,15 @@ xfs_iunlink_remove( ...@@ -1898,15 +1898,15 @@ xfs_iunlink_remove(
mp = tp->t_mountp; mp = tp->t_mountp;
agno = XFS_INO_TO_AGNO(mp, ip->i_ino); agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
agdaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); agdaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp));
/* /*
* Get the agi buffer first. It ensures lock ordering * Get the agi buffer first. It ensures lock ordering
* on the list. * on the list.
*/ */
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, agdaddr, error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, agdaddr,
1, 0, &agibp); XFS_FSS_TO_BB(mp, 1), 0, &agibp);
if (error != 0) { if (error) {
cmn_err(CE_WARN, cmn_err(CE_WARN,
"xfs_iunlink_remove: xfs_trans_read_buf() returned an error %d on %s. Returning error.", "xfs_iunlink_remove: xfs_trans_read_buf() returned an error %d on %s. Returning error.",
error, mp->m_fsname); error, mp->m_fsname);
......
fs/xfs/xfs_log_recover.c
View file @ 7dee2451
...@@ -50,7 +50,7 @@ STATIC void xlog_recover_check_ail(xfs_mount_t *mp, xfs_log_item_t *lip, ...@@ -50,7 +50,7 @@ STATIC void xlog_recover_check_ail(xfs_mount_t *mp, xfs_log_item_t *lip,
xfs_buf_t * xfs_buf_t *
xlog_get_bp(int num_bblks,xfs_mount_t *mp) xlog_get_bp(int num_bblks, xfs_mount_t *mp)
{ {
xfs_buf_t *bp; xfs_buf_t *bp;
...@@ -242,15 +242,15 @@ xlog_recover_iodone( ...@@ -242,15 +242,15 @@ xlog_recover_iodone(
* necessarily be perfect. * necessarily be perfect.
*/ */
int int
xlog_find_cycle_start(xlog_t *log, xlog_find_cycle_start(xlog_t *log,
xfs_buf_t *bp, xfs_buf_t *bp,
xfs_daddr_t first_blk, xfs_daddr_t first_blk,
xfs_daddr_t *last_blk, xfs_daddr_t *last_blk,
uint cycle) uint cycle)
{ {
xfs_daddr_t mid_blk; xfs_daddr_t mid_blk;
uint mid_cycle; uint mid_cycle;
int error; int error;
mid_blk = BLK_AVG(first_blk, *last_blk); mid_blk = BLK_AVG(first_blk, *last_blk);
while (mid_blk != first_blk && mid_blk != *last_blk) { while (mid_blk != first_blk && mid_blk != *last_blk) {
...@@ -307,9 +307,10 @@ xlog_find_verify_cycle( xlog_t *log, ...@@ -307,9 +307,10 @@ xlog_find_verify_cycle( xlog_t *log,
return ENOMEM; return ENOMEM;
} }
for (i = start_blk; i < start_blk + nbblks; i += bufblks) {
int bcount;
for (i = start_blk; i < start_blk + nbblks; i += bufblks) { bcount = min(bufblks, (start_blk + nbblks - i));
int bcount = min(bufblks, (start_blk + nbblks - i));
if ((error = xlog_bread(log, i, bcount, bp))) if ((error = xlog_bread(log, i, bcount, bp)))
goto out; goto out;
...@@ -373,11 +374,10 @@ xlog_find_verify_log_record(xlog_t *log, ...@@ -373,11 +374,10 @@ xlog_find_verify_log_record(xlog_t *log,
} else { } else {
if ((error = xlog_bread(log, start_blk, num_blks, bp))) if ((error = xlog_bread(log, start_blk, num_blks, bp)))
goto out; goto out;
buf = XFS_BUF_PTR(bp) + (num_blks - 1) * BBSIZE; buf = XFS_BUF_PTR(bp) + ((num_blks - 1) << BBSHIFT);
} }
for (i = (*last_blk) - 1; i >= 0; i--) {
for (i=(*last_blk)-1; i>=0; i--) {
if (i < start_blk) { if (i < start_blk) {
/* legal log record not found */ /* legal log record not found */
xlog_warn("XFS: Log inconsistent (didn't find previous header)"); xlog_warn("XFS: Log inconsistent (didn't find previous header)");
...@@ -422,7 +422,8 @@ xlog_find_verify_log_record(xlog_t *log, ...@@ -422,7 +422,8 @@ xlog_find_verify_log_record(xlog_t *log,
* record do we update last_blk. * record do we update last_blk.
*/ */
if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) { if (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb)) {
int h_size = INT_GET(head->h_size, ARCH_CONVERT); uint h_size = INT_GET(head->h_size, ARCH_CONVERT);
xhdrs = h_size / XLOG_HEADER_CYCLE_SIZE; xhdrs = h_size / XLOG_HEADER_CYCLE_SIZE;
if (h_size % XLOG_HEADER_CYCLE_SIZE) if (h_size % XLOG_HEADER_CYCLE_SIZE)
xhdrs++; xhdrs++;
...@@ -715,10 +716,10 @@ xlog_find_head(xlog_t *log, ...@@ -715,10 +716,10 @@ xlog_find_head(xlog_t *log,
* available. * available.
*/ */
int int
xlog_find_tail(xlog_t *log, xlog_find_tail(xlog_t *log,
xfs_daddr_t *head_blk, xfs_daddr_t *head_blk,
xfs_daddr_t *tail_blk, xfs_daddr_t *tail_blk,
int readonly) int readonly)
{ {
xlog_rec_header_t *rhead; xlog_rec_header_t *rhead;
xlog_op_header_t *op_head; xlog_op_header_t *op_head;
...@@ -925,7 +926,6 @@ xlog_find_zeroed(struct log *log, ...@@ -925,7 +926,6 @@ xlog_find_zeroed(struct log *log,
xfs_daddr_t num_scan_bblks; xfs_daddr_t num_scan_bblks;
int error, log_bbnum = log->l_logBBsize; int error, log_bbnum = log->l_logBBsize;
error = 0;
/* check totally zeroed log */ /* check totally zeroed log */
bp = xlog_get_bp(1,log->l_mp); bp = xlog_get_bp(1,log->l_mp);
if (!bp) if (!bp)
...@@ -1088,14 +1088,11 @@ xlog_clear_stale_blocks( ...@@ -1088,14 +1088,11 @@ xlog_clear_stale_blocks(
xlog_t *log, xlog_t *log,
xfs_lsn_t tail_lsn) xfs_lsn_t tail_lsn)
{ {
int tail_cycle; int tail_cycle, head_cycle;
int head_cycle; int tail_block, head_block;
int tail_block; int tail_distance, max_distance;
int head_block; int distance;
int tail_distance; int error;
int max_distance;
int distance;
int error;
tail_cycle = CYCLE_LSN(tail_lsn, ARCH_NOCONVERT); tail_cycle = CYCLE_LSN(tail_lsn, ARCH_NOCONVERT);
tail_block = BLOCK_LSN(tail_lsn, ARCH_NOCONVERT); tail_block = BLOCK_LSN(tail_lsn, ARCH_NOCONVERT);
...@@ -1118,8 +1115,7 @@ xlog_clear_stale_blocks( ...@@ -1118,8 +1115,7 @@ xlog_clear_stale_blocks(
*/ */
if (head_block < tail_block || head_block >= log->l_logBBsize) if (head_block < tail_block || head_block >= log->l_logBBsize)
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
tail_distance = tail_block + tail_distance = tail_block + (log->l_logBBsize - head_block);
(log->l_logBBsize - head_block);
} else { } else {
/* /*
* The head is behind the tail in the physical log, * The head is behind the tail in the physical log,
...@@ -1980,13 +1976,12 @@ xlog_recover_do_buffer_trans(xlog_t *log, ...@@ -1980,13 +1976,12 @@ xlog_recover_do_buffer_trans(xlog_t *log,
* the buffer out of the buffer cache so that the buffer won't * the buffer out of the buffer cache so that the buffer won't
* overlap with future reads of those inodes. * overlap with future reads of those inodes.
*/ */
error = 0; if (XFS_DINODE_MAGIC ==
INT_GET(*((__uint16_t *)(xfs_buf_offset(bp, 0))), ARCH_CONVERT) &&
if ((INT_GET(*((__uint16_t *)(xfs_buf_offset(bp, 0))), ARCH_CONVERT) == XFS_DINODE_MAGIC) &&
(XFS_BUF_COUNT(bp) != MAX(log->l_mp->m_sb.sb_blocksize, (XFS_BUF_COUNT(bp) != MAX(log->l_mp->m_sb.sb_blocksize,
(__uint32_t)XFS_INODE_CLUSTER_SIZE(log->l_mp)))) { (__uint32_t)XFS_INODE_CLUSTER_SIZE(log->l_mp)))) {
XFS_BUF_STALE(bp); XFS_BUF_STALE(bp);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
} else { } else {
ASSERT(XFS_BUF_FSPRIVATE(bp, void *) == NULL || ASSERT(XFS_BUF_FSPRIVATE(bp, void *) == NULL ||
XFS_BUF_FSPRIVATE(bp, xfs_mount_t *) == mp); XFS_BUF_FSPRIVATE(bp, xfs_mount_t *) == mp);
...@@ -2042,6 +2037,7 @@ xlog_recover_do_inode_trans(xlog_t *log, ...@@ -2042,6 +2037,7 @@ xlog_recover_do_inode_trans(xlog_t *log,
imap.im_blkno = 0; imap.im_blkno = 0;
xfs_imap(log->l_mp, 0, ino, &imap, 0); xfs_imap(log->l_mp, 0, ino, &imap, 0);
} }
bp = xfs_buf_read_flags(mp->m_ddev_targp, imap.im_blkno, imap.im_len, bp = xfs_buf_read_flags(mp->m_ddev_targp, imap.im_blkno, imap.im_len,
XFS_BUF_LOCK); XFS_BUF_LOCK);
if (XFS_BUF_ISERROR(bp)) { if (XFS_BUF_ISERROR(bp)) {
...@@ -2170,8 +2166,6 @@ xlog_recover_do_inode_trans(xlog_t *log, ...@@ -2170,8 +2166,6 @@ xlog_recover_do_inode_trans(xlog_t *log,
break; break;
} }
/* /*
* If we logged any attribute data, recover it. There may or * If we logged any attribute data, recover it. There may or
* may not have been any other non-core data logged in this * may not have been any other non-core data logged in this
...@@ -2844,7 +2838,6 @@ xlog_recover_clear_agi_bucket( ...@@ -2844,7 +2838,6 @@ xlog_recover_clear_agi_bucket(
{ {
xfs_trans_t *tp; xfs_trans_t *tp;
xfs_agi_t *agi; xfs_agi_t *agi;
xfs_daddr_t agidaddr;
xfs_buf_t *agibp; xfs_buf_t *agibp;
int offset; int offset;
int error; int error;
...@@ -2852,9 +2845,9 @@ xlog_recover_clear_agi_bucket( ...@@ -2852,9 +2845,9 @@ xlog_recover_clear_agi_bucket(
tp = xfs_trans_alloc(mp, XFS_TRANS_CLEAR_AGI_BUCKET); tp = xfs_trans_alloc(mp, XFS_TRANS_CLEAR_AGI_BUCKET);
xfs_trans_reserve(tp, 0, XFS_CLEAR_AGI_BUCKET_LOG_RES(mp), 0, 0, 0); xfs_trans_reserve(tp, 0, XFS_CLEAR_AGI_BUCKET_LOG_RES(mp), 0, 0, 0);
agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, agidaddr, XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
1, 0, &agibp); XFS_FSS_TO_BB(mp, 1), 0, &agibp);
if (error) { if (error) {
xfs_trans_cancel(tp, XFS_TRANS_ABORT); xfs_trans_cancel(tp, XFS_TRANS_ABORT);
return; return;
...@@ -2895,7 +2888,6 @@ xlog_recover_process_iunlinks(xlog_t *log) ...@@ -2895,7 +2888,6 @@ xlog_recover_process_iunlinks(xlog_t *log)
xfs_mount_t *mp; xfs_mount_t *mp;
xfs_agnumber_t agno; xfs_agnumber_t agno;
xfs_agi_t *agi; xfs_agi_t *agi;
xfs_daddr_t agidaddr;
xfs_buf_t *agibp; xfs_buf_t *agibp;
xfs_buf_t *ibp; xfs_buf_t *ibp;
xfs_dinode_t *dip; xfs_dinode_t *dip;
...@@ -2920,14 +2912,17 @@ xlog_recover_process_iunlinks(xlog_t *log) ...@@ -2920,14 +2912,17 @@ xlog_recover_process_iunlinks(xlog_t *log)
/* /*
* Find the agi for this ag. * Find the agi for this ag.
*/ */
agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); agibp = xfs_buf_read(mp->m_ddev_targp,
agibp = xfs_buf_read(mp->m_ddev_targp, agidaddr, 1, 0); XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
XFS_FSS_TO_BB(mp, 1), 0);
if (XFS_BUF_ISERROR(agibp)) { if (XFS_BUF_ISERROR(agibp)) {
xfs_ioerror_alert("xlog_recover_process_iunlinks(agi#1)", xfs_ioerror_alert("xlog_recover_process_iunlinks(#1)",
log->l_mp, agibp, agidaddr); log->l_mp, agibp,
XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)));
} }
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(XFS_AGI_MAGIC ==
INT_GET(agi->agi_magicnum, ARCH_CONVERT));
for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) { for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) {
...@@ -3006,15 +3001,20 @@ xlog_recover_process_iunlinks(xlog_t *log) ...@@ -3006,15 +3001,20 @@ xlog_recover_process_iunlinks(xlog_t *log)
* Reacquire the agibuffer and continue around * Reacquire the agibuffer and continue around
* the loop. * the loop.
*/ */
agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR);
agibp = xfs_buf_read(mp->m_ddev_targp, agibp = xfs_buf_read(mp->m_ddev_targp,
agidaddr, 1, 0); XFS_AG_DADDR(mp, agno,
XFS_AGI_DADDR(mp)),
XFS_FSS_TO_BB(mp, 1), 0);
if (XFS_BUF_ISERROR(agibp)) { if (XFS_BUF_ISERROR(agibp)) {
xfs_ioerror_alert("xlog_recover_process_iunlinks(agi#2)", xfs_ioerror_alert(
log->l_mp, agibp, agidaddr); "xlog_recover_process_iunlinks(#2)",
log->l_mp, agibp,
XFS_AG_DADDR(mp, agno,
XFS_AGI_DADDR(mp)));
} }
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(XFS_AGI_MAGIC == INT_GET(
agi->agi_magicnum, ARCH_CONVERT));
} }
} }
...@@ -3485,9 +3485,8 @@ xlog_do_recover(xlog_t *log, ...@@ -3485,9 +3485,8 @@ xlog_do_recover(xlog_t *log,
return error; return error;
} }
/* convert superblock from on-disk format */ /* Convert superblock from on-disk format */
sbp = &log->l_mp->m_sb;
sbp=&log->l_mp->m_sb;
xfs_xlatesb(XFS_BUF_TO_SBP(bp), sbp, 1, ARCH_CONVERT, XFS_SB_ALL_BITS); xfs_xlatesb(XFS_BUF_TO_SBP(bp), sbp, 1, ARCH_CONVERT, XFS_SB_ALL_BITS);
ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC); ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC);
ASSERT(XFS_SB_GOOD_VERSION(sbp)); ASSERT(XFS_SB_GOOD_VERSION(sbp));
...@@ -3653,30 +3652,36 @@ xlog_recover_check_summary(xlog_t *log) ...@@ -3653,30 +3652,36 @@ xlog_recover_check_summary(xlog_t *log)
itotal = 0LL; itotal = 0LL;
ifree = 0LL; ifree = 0LL;
for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) { for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
agfdaddr = XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR); agfdaddr = XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp));
agfbp = xfs_buf_read(mp->m_ddev_targp, agfdaddr, 1, 0); agfbp = xfs_buf_read(mp->m_ddev_targp, agfdaddr,
XFS_FSS_TO_BB(mp, 1), 0);
if (XFS_BUF_ISERROR(agfbp)) { if (XFS_BUF_ISERROR(agfbp)) {
xfs_ioerror_alert("xlog_recover_check_summary(agf)", xfs_ioerror_alert("xlog_recover_check_summary(agf)",
log->l_mp, agfbp, agfdaddr); mp, agfbp, agfdaddr);
} }
agfp = XFS_BUF_TO_AGF(agfbp); agfp = XFS_BUF_TO_AGF(agfbp);
ASSERT(INT_GET(agfp->agf_magicnum, ARCH_CONVERT) == XFS_AGF_MAGIC); ASSERT(XFS_AGF_MAGIC ==
ASSERT(XFS_AGF_GOOD_VERSION(INT_GET(agfp->agf_versionnum, ARCH_CONVERT))); INT_GET(agfp->agf_magicnum, ARCH_CONVERT));
ASSERT(XFS_AGF_GOOD_VERSION(
INT_GET(agfp->agf_versionnum, ARCH_CONVERT)));
ASSERT(INT_GET(agfp->agf_seqno, ARCH_CONVERT) == agno); ASSERT(INT_GET(agfp->agf_seqno, ARCH_CONVERT) == agno);
freeblks += INT_GET(agfp->agf_freeblks, ARCH_CONVERT) + freeblks += INT_GET(agfp->agf_freeblks, ARCH_CONVERT) +
INT_GET(agfp->agf_flcount, ARCH_CONVERT); INT_GET(agfp->agf_flcount, ARCH_CONVERT);
xfs_buf_relse(agfbp); xfs_buf_relse(agfbp);
agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR); agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp));
agibp = xfs_buf_read(mp->m_ddev_targp, agidaddr, 1, 0); agibp = xfs_buf_read(mp->m_ddev_targp, agidaddr,
XFS_FSS_TO_BB(mp, 1), 0);
if (XFS_BUF_ISERROR(agibp)) { if (XFS_BUF_ISERROR(agibp)) {
xfs_ioerror_alert("xlog_recover_check_summary(agi)", xfs_ioerror_alert("xlog_recover_check_summary(agi)",
log->l_mp, agibp, agidaddr); log->l_mp, agibp, agidaddr);
} }
agip = XFS_BUF_TO_AGI(agibp); agip = XFS_BUF_TO_AGI(agibp);
ASSERT(INT_GET(agip->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(XFS_AGI_MAGIC ==
ASSERT(XFS_AGI_GOOD_VERSION(INT_GET(agip->agi_versionnum, ARCH_CONVERT))); INT_GET(agip->agi_magicnum, ARCH_CONVERT));
ASSERT(XFS_AGI_GOOD_VERSION(
INT_GET(agip->agi_versionnum, ARCH_CONVERT)));
ASSERT(INT_GET(agip->agi_seqno, ARCH_CONVERT) == agno); ASSERT(INT_GET(agip->agi_seqno, ARCH_CONVERT) == agno);
itotal += INT_GET(agip->agi_count, ARCH_CONVERT); itotal += INT_GET(agip->agi_count, ARCH_CONVERT);
......
fs/xfs/xfs_macros.c
View file @ 7dee2451
...@@ -2179,6 +2179,14 @@ xfs_sb_version_haslogv2(xfs_sb_t *sbp) ...@@ -2179,6 +2179,14 @@ xfs_sb_version_haslogv2(xfs_sb_t *sbp)
} }
#endif #endif
#if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_SB_VERSION_HASSECTOR)
int
xfs_sb_version_hassector(xfs_sb_t *sbp)
{
return XFS_SB_VERSION_HASSECTOR(sbp);
}
#endif
#if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_SB_VERSION_TONEW) #if XFS_WANT_FUNCS_C || (XFS_WANT_SPACE_C && XFSSO_XFS_SB_VERSION_TONEW)
unsigned unsigned
xfs_sb_version_tonew(unsigned v) xfs_sb_version_tonew(unsigned v)
......
fs/xfs/xfs_mount.c
View file @ 7dee2451
...@@ -215,11 +215,6 @@ xfs_mount_validate_sb( ...@@ -215,11 +215,6 @@ xfs_mount_validate_sb(
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
} }
if (!sbp->sb_logsectlog)
sbp->sb_logsectlog = sbp->sb_sectlog;
if (!sbp->sb_logsectsize)
sbp->sb_logsectsize = sbp->sb_sectsize;
/* /*
* More sanity checking. These were stolen directly from * More sanity checking. These were stolen directly from
* xfs_repair. * xfs_repair.
...@@ -229,10 +224,6 @@ xfs_mount_validate_sb( ...@@ -229,10 +224,6 @@ xfs_mount_validate_sb(
sbp->sb_sectsize > XFS_MAX_SECTORSIZE || sbp->sb_sectsize > XFS_MAX_SECTORSIZE ||
sbp->sb_sectlog < XFS_MIN_SECTORSIZE_LOG || sbp->sb_sectlog < XFS_MIN_SECTORSIZE_LOG ||
sbp->sb_sectlog > XFS_MAX_SECTORSIZE_LOG || sbp->sb_sectlog > XFS_MAX_SECTORSIZE_LOG ||
sbp->sb_logsectsize < XFS_MIN_SECTORSIZE ||
sbp->sb_logsectsize > XFS_MAX_SECTORSIZE ||
sbp->sb_logsectlog < XFS_MIN_SECTORSIZE_LOG ||
sbp->sb_logsectlog > XFS_MAX_SECTORSIZE_LOG ||
sbp->sb_blocksize < XFS_MIN_BLOCKSIZE || sbp->sb_blocksize < XFS_MIN_BLOCKSIZE ||
sbp->sb_blocksize > XFS_MAX_BLOCKSIZE || sbp->sb_blocksize > XFS_MAX_BLOCKSIZE ||
sbp->sb_blocklog < XFS_MIN_BLOCKSIZE_LOG || sbp->sb_blocklog < XFS_MIN_BLOCKSIZE_LOG ||
...@@ -276,10 +267,10 @@ xfs_mount_validate_sb( ...@@ -276,10 +267,10 @@ xfs_mount_validate_sb(
*/ */
if (sbp->sb_blocksize > PAGE_SIZE) { if (sbp->sb_blocksize > PAGE_SIZE) {
cmn_err(CE_WARN, cmn_err(CE_WARN,
"XFS: Trying to mount file system with blocksize %d bytes", "XFS: Attempted to mount file system with blocksize %d bytes",
sbp->sb_blocksize); sbp->sb_blocksize);
cmn_err(CE_WARN, cmn_err(CE_WARN,
"XFS: Only page-sized (%d bytes) or less blocksizes currently work.", "XFS: Only page-sized (%d) or less blocksizes currently work.",
PAGE_SIZE); PAGE_SIZE);
return XFS_ERROR(EWRONGFS); return XFS_ERROR(EWRONGFS);
} }
...@@ -795,8 +786,8 @@ xfs_mountfs( ...@@ -795,8 +786,8 @@ xfs_mountfs(
goto error1; goto error1;
} }
error = xfs_read_buf(mp, mp->m_logdev_targp, error = xfs_read_buf(mp, mp->m_logdev_targp,
d - XFS_LOGS_TO_BB(mp, 1), d - XFS_FSB_TO_BB(mp, 1),
XFS_LOGS_TO_BB(mp, 1), 0, &bp); XFS_FSB_TO_BB(mp, 1), 0, &bp);
if (!error) { if (!error) {
xfs_buf_relse(bp); xfs_buf_relse(bp);
} else { } else {
......
fs/xfs/xfs_rtalloc.c
View file @ 7dee2451
...@@ -1925,7 +1925,8 @@ xfs_growfs_rt( ...@@ -1925,7 +1925,8 @@ xfs_growfs_rt(
* Read in the last block of the device, make sure it exists. * Read in the last block of the device, make sure it exists.
*/ */
error = xfs_read_buf(mp, mp->m_rtdev_targp, error = xfs_read_buf(mp, mp->m_rtdev_targp,
XFS_FSB_TO_BB(mp, in->newblocks) - 1, 1, 0, &bp); XFS_FSB_TO_BB(mp, in->newblocks - 1),
XFS_FSB_TO_BB(mp, 1), 0, &bp);
if (error) if (error)
return error; return error;
ASSERT(bp); ASSERT(bp);
...@@ -2285,7 +2286,9 @@ xfs_rtmount_init( ...@@ -2285,7 +2286,9 @@ xfs_rtmount_init(
(unsigned long long) mp->m_sb.sb_rblocks); (unsigned long long) mp->m_sb.sb_rblocks);
return XFS_ERROR(E2BIG); return XFS_ERROR(E2BIG);
} }
error = xfs_read_buf(mp, mp->m_rtdev_targp, d - 1, 1, 0, &bp); error = xfs_read_buf(mp, mp->m_rtdev_targp,
XFS_FSB_TO_BB(mp, d - 1),
XFS_FSB_TO_BB(mp, 1), 0, &bp);
if (error) { if (error) {
cmn_err(CE_WARN, cmn_err(CE_WARN,
"XFS: realtime mount -- xfs_read_buf failed, returned %d", error); "XFS: realtime mount -- xfs_read_buf failed, returned %d", error);
......
fs/xfs/xfs_sb.h
View file @ 7dee2451
...@@ -57,6 +57,7 @@ struct xfs_mount; ...@@ -57,6 +57,7 @@ struct xfs_mount;
#define XFS_SB_VERSION_DALIGNBIT 0x0100 #define XFS_SB_VERSION_DALIGNBIT 0x0100
#define XFS_SB_VERSION_SHAREDBIT 0x0200 #define XFS_SB_VERSION_SHAREDBIT 0x0200
#define XFS_SB_VERSION_LOGV2BIT 0x0400 #define XFS_SB_VERSION_LOGV2BIT 0x0400
#define XFS_SB_VERSION_SECTORBIT 0x0800
#define XFS_SB_VERSION_EXTFLGBIT 0x1000 #define XFS_SB_VERSION_EXTFLGBIT 0x1000
#define XFS_SB_VERSION_DIRV2BIT 0x2000 #define XFS_SB_VERSION_DIRV2BIT 0x2000
#define XFS_SB_VERSION_OKSASHFBITS \ #define XFS_SB_VERSION_OKSASHFBITS \
...@@ -69,7 +70,8 @@ struct xfs_mount; ...@@ -69,7 +70,8 @@ struct xfs_mount;
XFS_SB_VERSION_ALIGNBIT | \ XFS_SB_VERSION_ALIGNBIT | \
XFS_SB_VERSION_DALIGNBIT | \ XFS_SB_VERSION_DALIGNBIT | \
XFS_SB_VERSION_SHAREDBIT | \ XFS_SB_VERSION_SHAREDBIT | \
XFS_SB_VERSION_LOGV2BIT) XFS_SB_VERSION_LOGV2BIT | \
XFS_SB_VERSION_SECTORBIT)
#define XFS_SB_VERSION_OKSASHBITS \ #define XFS_SB_VERSION_OKSASHBITS \
(XFS_SB_VERSION_NUMBITS | \ (XFS_SB_VERSION_NUMBITS | \
XFS_SB_VERSION_REALFBITS | \ XFS_SB_VERSION_REALFBITS | \
...@@ -78,14 +80,15 @@ struct xfs_mount; ...@@ -78,14 +80,15 @@ struct xfs_mount;
(XFS_SB_VERSION_NUMBITS | \ (XFS_SB_VERSION_NUMBITS | \
XFS_SB_VERSION_OKREALFBITS | \ XFS_SB_VERSION_OKREALFBITS | \
XFS_SB_VERSION_OKSASHFBITS) XFS_SB_VERSION_OKSASHFBITS)
#define XFS_SB_VERSION_MKFS(ia,dia,extflag,dirv2,na) \ #define XFS_SB_VERSION_MKFS(ia,dia,extflag,dirv2,na,sflag) \
(((ia) || (dia) || (extflag) || (dirv2) || (na)) ? \ (((ia) || (dia) || (extflag) || (dirv2) || (na)) ? \
(XFS_SB_VERSION_4 | \ (XFS_SB_VERSION_4 | \
((ia) ? XFS_SB_VERSION_ALIGNBIT : 0) | \ ((ia) ? XFS_SB_VERSION_ALIGNBIT : 0) | \
((dia) ? XFS_SB_VERSION_DALIGNBIT : 0) | \ ((dia) ? XFS_SB_VERSION_DALIGNBIT : 0) | \
((extflag) ? XFS_SB_VERSION_EXTFLGBIT : 0) | \ ((extflag) ? XFS_SB_VERSION_EXTFLGBIT : 0) | \
((dirv2) ? XFS_SB_VERSION_DIRV2BIT : 0) | \ ((dirv2) ? XFS_SB_VERSION_DIRV2BIT : 0) | \
((na) ? XFS_SB_VERSION_LOGV2BIT : 0)) : \ ((na) ? XFS_SB_VERSION_LOGV2BIT : 0) | \
((sflag) ? XFS_SB_VERSION_SECTORBIT : 0)) : \
XFS_SB_VERSION_1) XFS_SB_VERSION_1)
typedef struct xfs_sb typedef struct xfs_sb
...@@ -441,6 +444,15 @@ int xfs_sb_version_subextflgbit(xfs_sb_t *sbp); ...@@ -441,6 +444,15 @@ int xfs_sb_version_subextflgbit(xfs_sb_t *sbp);
((sbp)->sb_versionnum & ~XFS_SB_VERSION_EXTFLGBIT)) ((sbp)->sb_versionnum & ~XFS_SB_VERSION_EXTFLGBIT))
#endif #endif
#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_HASSECTOR)
int xfs_sb_version_hassector(xfs_sb_t *sbp);
#define XFS_SB_VERSION_HASSECTOR(sbp) xfs_sb_version_hassector(sbp)
#else
#define XFS_SB_VERSION_HASSECTOR(sbp) \
((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \
((sbp)->sb_versionnum & XFS_SB_VERSION_SECTORBIT))
#endif
/* /*
* end of superblock version macros * end of superblock version macros
*/ */
...@@ -486,7 +498,6 @@ xfs_sb_t *xfs_buf_to_sbp(struct xfs_buf *bp); ...@@ -486,7 +498,6 @@ xfs_sb_t *xfs_buf_to_sbp(struct xfs_buf *bp);
* File system sector to basic block conversions. * File system sector to basic block conversions.
*/ */
#define XFS_FSS_TO_BB(mp,sec) ((sec) << (mp)->m_sectbb_log) #define XFS_FSS_TO_BB(mp,sec) ((sec) << (mp)->m_sectbb_log)
#define XFS_LOGS_TO_BB(mp,sec) ((sec) << ((mp)->m_sb.sb_logsectlog - BBSHIFT))
#define XFS_BB_TO_FSS(mp,bb) \ #define XFS_BB_TO_FSS(mp,bb) \
(((bb) + (XFS_FSS_TO_BB(mp,1) - 1)) >> (mp)->m_sectbb_log) (((bb) + (XFS_FSS_TO_BB(mp,1) - 1)) >> (mp)->m_sectbb_log)
#define XFS_BB_TO_FSST(mp,bb) ((bb) >> (mp)->m_sectbb_log) #define XFS_BB_TO_FSST(mp,bb) ((bb) >> (mp)->m_sectbb_log)
...@@ -509,8 +520,7 @@ xfs_sb_t *xfs_buf_to_sbp(struct xfs_buf *bp); ...@@ -509,8 +520,7 @@ xfs_sb_t *xfs_buf_to_sbp(struct xfs_buf *bp);
/* /*
* File system block to byte conversions. * File system block to byte conversions.
*/ */
#define XFS_FSB_TO_B(mp,fsbno) ((xfs_fsize_t)(fsbno) << \ #define XFS_FSB_TO_B(mp,fsbno) ((xfs_fsize_t)(fsbno) << (mp)->m_sb.sb_blocklog)
(mp)->m_sb.sb_blocklog)
#define XFS_B_TO_FSB(mp,b) \ #define XFS_B_TO_FSB(mp,b) \
((((__uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog) ((((__uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog)
#define XFS_B_TO_FSBT(mp,b) (((__uint64_t)(b)) >> (mp)->m_sb.sb_blocklog) #define XFS_B_TO_FSBT(mp,b) (((__uint64_t)(b)) >> (mp)->m_sb.sb_blocklog)
......
fs/xfs/xfs_vfsops.c
View file @ 7dee2451
...@@ -451,9 +451,13 @@ xfs_mount( ...@@ -451,9 +451,13 @@ xfs_mount(
xfs_size_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize, xfs_size_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,
mp->m_sb.sb_sectsize); mp->m_sb.sb_sectsize);
if (logdev && logdev != ddev) if (logdev && logdev != ddev) {
xfs_size_buftarg(mp->m_logdev_targp, mp->m_sb.sb_blocksize, unsigned int ss = BBSIZE;
mp->m_sb.sb_logsectsize);
if (XFS_SB_VERSION_HASSECTOR(&mp->m_sb))
ss = mp->m_sb.sb_logsectsize;
xfs_size_buftarg(mp->m_logdev_targp, mp->m_sb.sb_blocksize, ss);
}
if (rtdev) if (rtdev)
xfs_size_buftarg(mp->m_logdev_targp, mp->m_sb.sb_blocksize, xfs_size_buftarg(mp->m_logdev_targp, mp->m_sb.sb_blocksize,
mp->m_sb.sb_blocksize); mp->m_sb.sb_blocksize);
......
fs/xfs/xfsidbg.c
View file @ 7dee2451
...@@ -4660,9 +4660,10 @@ xfsidbg_xmount(xfs_mount_t *mp) ...@@ -4660,9 +4660,10 @@ xfsidbg_xmount(xfs_mount_t *mp)
kdb_printf("dalign %d swidth %d sinoalign %d attr_magicpct %d dir_magicpct %d\n", kdb_printf("dalign %d swidth %d sinoalign %d attr_magicpct %d dir_magicpct %d\n",
mp->m_dalign, mp->m_swidth, mp->m_sinoalign, mp->m_dalign, mp->m_swidth, mp->m_sinoalign,
mp->m_attr_magicpct, mp->m_dir_magicpct); mp->m_attr_magicpct, mp->m_dir_magicpct);
kdb_printf("mk_sharedro %d dirversion %d dirblkfsbs %d &dirops 0x%p\n", kdb_printf("mk_sharedro %d inode_quiesce %d sectbb_log %d\n",
mp->m_mk_sharedro, mp->m_dirversion, mp->m_dirblkfsbs, mp->m_mk_sharedro, mp->m_inode_quiesce, mp->m_sectbb_log);
&mp->m_dirops); kdb_printf("dirversion %d dirblkfsbs %d &dirops 0x%p\n",
mp->m_dirversion, mp->m_dirblkfsbs, &mp->m_dirops);
kdb_printf("dirblksize %d dirdatablk 0x%Lx dirleafblk 0x%Lx dirfreeblk 0x%Lx\n", kdb_printf("dirblksize %d dirdatablk 0x%Lx dirleafblk 0x%Lx dirfreeblk 0x%Lx\n",
mp->m_dirblksize, mp->m_dirblksize,
(xfs_dfiloff_t)mp->m_dirdatablk, (xfs_dfiloff_t)mp->m_dirdatablk,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7