system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: remove XFS_IFEXTENTS

Browse source 
The in-memory XFS_IFEXTENTS is now only used to check if an inode with
extents still needs the extents to be read into memory before doing
operations that need the extent map.  Add a new xfs_need_iread_extents
helper that returns true for btree format forks that do not have any
entries in the in-memory extent btree, and use that instead of checking
the XFS_IFEXTENTS flag.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2021-04-13 11:15:12 -07:00 committed by Darrick J. Wong
parent 0779f4a68d
commit b2197a36c0
12 changed files with 19 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_attr_leaf.c
View file

@ -651,10 +651,8 @@ xfs_attr_shortform_create(
trace_xfs_attr_sf_create(args); trace_xfs_attr_sf_create(args);
ASSERT(ifp->if_bytes == 0); ASSERT(ifp->if_bytes == 0);
if (ifp->if_format == XFS_DINODE_FMT_EXTENTS) { if (ifp->if_format == XFS_DINODE_FMT_EXTENTS)
ifp->if_flags &= ~XFS_IFEXTENTS; /* just in case */
ifp->if_format = XFS_DINODE_FMT_LOCAL; ifp->if_format = XFS_DINODE_FMT_LOCAL;
}
xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK); xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK);
hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data; hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data;
memset(hdr, 0, sizeof(*hdr)); memset(hdr, 0, sizeof(*hdr));

14
fs/xfs/libxfs/xfs_bmap.c
View file

@ -605,7 +605,7 @@ xfs_bmap_btree_to_extents(
ASSERT(cur); ASSERT(cur);
ASSERT(whichfork != XFS_COW_FORK); ASSERT(whichfork != XFS_COW_FORK);
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(!xfs_need_iread_extents(ifp));
ASSERT(ifp->if_format == XFS_DINODE_FMT_BTREE); ASSERT(ifp->if_format == XFS_DINODE_FMT_BTREE);
ASSERT(be16_to_cpu(rblock->bb_level) == 1); ASSERT(be16_to_cpu(rblock->bb_level) == 1);
ASSERT(be16_to_cpu(rblock->bb_numrecs) == 1); ASSERT(be16_to_cpu(rblock->bb_numrecs) == 1);
@ -805,7 +805,6 @@ xfs_bmap_local_to_extents_empty(
ASSERT(ifp->if_nextents == 0); ASSERT(ifp->if_nextents == 0);
xfs_bmap_forkoff_reset(ip, whichfork); xfs_bmap_forkoff_reset(ip, whichfork);
ifp->if_flags |= XFS_IFEXTENTS;
ifp->if_u1.if_root = NULL; ifp->if_u1.if_root = NULL;
ifp->if_height = 0; ifp->if_height = 0;
ifp->if_format = XFS_DINODE_FMT_EXTENTS; ifp->if_format = XFS_DINODE_FMT_EXTENTS;
@ -849,7 +848,6 @@ xfs_bmap_local_to_extents(
flags = 0; flags = 0;
error = 0; error = 0;
ASSERT(!(ifp->if_flags & XFS_IFEXTENTS));
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.tp = tp; args.tp = tp;
args.mp = ip->i_mount; args.mp = ip->i_mount;
@ -1098,7 +1096,6 @@ xfs_bmap_add_attrfork(
ASSERT(ip->i_afp == NULL); ASSERT(ip->i_afp == NULL);
ip->i_afp = xfs_ifork_alloc(XFS_DINODE_FMT_EXTENTS, 0); ip->i_afp = xfs_ifork_alloc(XFS_DINODE_FMT_EXTENTS, 0);
ip->i_afp->if_flags = XFS_IFEXTENTS;
logflags = 0; logflags = 0;
switch (ip->i_df.if_format) { switch (ip->i_df.if_format) {
case XFS_DINODE_FMT_LOCAL: case XFS_DINODE_FMT_LOCAL:
@ -1224,16 +1221,11 @@ xfs_iread_extents(
struct xfs_btree_cur *cur; struct xfs_btree_cur *cur;
int error; int error;
if (ifp->if_flags & XFS_IFEXTENTS) if (!xfs_need_iread_extents(ifp))
return 0; return 0;
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
if (XFS_IS_CORRUPT(mp, ifp->if_format != XFS_DINODE_FMT_BTREE)) {
error = -EFSCORRUPTED;
goto out;
}
ir.loaded = 0; ir.loaded = 0;
xfs_iext_first(ifp, &ir.icur); xfs_iext_first(ifp, &ir.icur);
cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork); cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
@ -1248,8 +1240,6 @@ xfs_iread_extents(
goto out; goto out;
} }
ASSERT(ir.loaded == xfs_iext_count(ifp)); ASSERT(ir.loaded == xfs_iext_count(ifp));
ifp->if_flags |= XFS_IFEXTENTS;
return 0; return 0;
out: out:
xfs_iext_destroy(ifp); xfs_iext_destroy(ifp);

1
fs/xfs/libxfs/xfs_dir2_sf.c
View file

@ -827,7 +827,6 @@ xfs_dir2_sf_create(
* convert it to local format. * convert it to local format.
*/ */
if (dp->i_df.if_format == XFS_DINODE_FMT_EXTENTS) { if (dp->i_df.if_format == XFS_DINODE_FMT_EXTENTS) {
dp->i_df.if_flags &= ~XFS_IFEXTENTS; /* just in case */
dp->i_df.if_format = XFS_DINODE_FMT_LOCAL; dp->i_df.if_format = XFS_DINODE_FMT_LOCAL;
xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE); xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE);
} }

6
fs/xfs/libxfs/xfs_inode_fork.c
View file

@ -60,7 +60,6 @@ xfs_init_local_fork(
} }
ifp->if_bytes = size; ifp->if_bytes = size;
ifp->if_flags &= ~XFS_IFEXTENTS;
} }
/* /*
@ -150,7 +149,6 @@ xfs_iformat_extents(
xfs_iext_next(ifp, &icur); xfs_iext_next(ifp, &icur);
} }
} }
ifp->if_flags |= XFS_IFEXTENTS;
return 0; return 0;
} }
@ -212,7 +210,6 @@ xfs_iformat_btree(
*/ */
xfs_bmdr_to_bmbt(ip, dfp, XFS_DFORK_SIZE(dip, ip->i_mount, whichfork), xfs_bmdr_to_bmbt(ip, dfp, XFS_DFORK_SIZE(dip, ip->i_mount, whichfork),
ifp->if_broot, size); ifp->if_broot, size);
ifp->if_flags &= ~XFS_IFEXTENTS;
ifp->if_bytes = 0; ifp->if_bytes = 0;
ifp->if_u1.if_root = NULL; ifp->if_u1.if_root = NULL;
@ -622,8 +619,6 @@ xfs_iflush_fork(
break; break;
case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_EXTENTS:
ASSERT((ifp->if_flags & XFS_IFEXTENTS) ||
!(iip->ili_fields & extflag[whichfork]));
if ((iip->ili_fields & extflag[whichfork]) && if ((iip->ili_fields & extflag[whichfork]) &&
(ifp->if_bytes > 0)) { (ifp->if_bytes > 0)) {
ASSERT(ifp->if_nextents > 0); ASSERT(ifp->if_nextents > 0);
@ -683,7 +678,6 @@ xfs_ifork_init_cow(
ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_zone, ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_zone,
GFP_NOFS | __GFP_NOFAIL); GFP_NOFS | __GFP_NOFAIL);
ip->i_cowfp->if_flags = XFS_IFEXTENTS;
ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS; ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS;
} }

12
fs/xfs/libxfs/xfs_inode_fork.h
View file

@ -22,16 +22,10 @@ struct xfs_ifork {
char *if_data; /* inline file data */ char *if_data; /* inline file data */
} if_u1; } if_u1;
short if_broot_bytes; /* bytes allocated for root */ short if_broot_bytes; /* bytes allocated for root */
unsigned char if_flags; /* per-fork flags */
int8_t if_format; /* format of this fork */ int8_t if_format; /* format of this fork */
xfs_extnum_t if_nextents; /* # of extents in this fork */ xfs_extnum_t if_nextents; /* # of extents in this fork */
}; };
/*
* Per-fork incore inode flags.
*/
#define XFS_IFEXTENTS 0x02 /* All extent pointers are read in */
/* /*
* Worst-case increase in the fork extent count when we're adding a single * Worst-case increase in the fork extent count when we're adding a single
* extent to a fork and there's no possibility of splitting an existing mapping. * extent to a fork and there's no possibility of splitting an existing mapping.
@ -236,4 +230,10 @@ int xfs_ifork_verify_local_attr(struct xfs_inode *ip);
int xfs_iext_count_may_overflow(struct xfs_inode *ip, int whichfork, int xfs_iext_count_may_overflow(struct xfs_inode *ip, int whichfork,
int nr_to_add); int nr_to_add);
/* returns true if the fork has extents but they are not read in yet. */
static inline bool xfs_need_iread_extents(struct xfs_ifork *ifp)
{
return ifp->if_format == XFS_DINODE_FMT_BTREE && ifp->if_height == 0;
}
#endif /* __XFS_INODE_FORK_H__ */ #endif /* __XFS_INODE_FORK_H__ */

6
fs/xfs/scrub/bmap.c
View file

@ -447,7 +447,7 @@ xchk_bmap_btree(
int error; int error;
/* Load the incore bmap cache if it's not loaded. */ /* Load the incore bmap cache if it's not loaded. */
info->was_loaded = ifp->if_flags & XFS_IFEXTENTS; info->was_loaded = !xfs_need_iread_extents(ifp);
error = xfs_iread_extents(sc->tp, ip, whichfork); error = xfs_iread_extents(sc->tp, ip, whichfork);
if (!xchk_fblock_process_error(sc, whichfork, 0, &error)) if (!xchk_fblock_process_error(sc, whichfork, 0, &error))
@ -673,10 +673,6 @@ xchk_bmap(
/* No mappings to check. */ /* No mappings to check. */
goto out; goto out;
case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_EXTENTS:
if (!(ifp->if_flags & XFS_IFEXTENTS)) {
xchk_fblock_set_corrupt(sc, whichfork, 0);
goto out;
}
break; break;
case XFS_DINODE_FMT_BTREE: case XFS_DINODE_FMT_BTREE:
if (whichfork == XFS_COW_FORK) { if (whichfork == XFS_COW_FORK) {

3
fs/xfs/xfs_aops.c
View file

@ -291,8 +291,7 @@ xfs_map_blocks(
cow_fsb = NULLFILEOFF; cow_fsb = NULLFILEOFF;
whichfork = XFS_DATA_FORK; whichfork = XFS_DATA_FORK;
xfs_ilock(ip, XFS_ILOCK_SHARED); xfs_ilock(ip, XFS_ILOCK_SHARED);
ASSERT(ip->i_df.if_format != XFS_DINODE_FMT_BTREE || ASSERT(!xfs_need_iread_extents(&ip->i_df));
(ip->i_df.if_flags & XFS_IFEXTENTS));
/* /*
* Check if this is offset is covered by a COW extents, and if yes use * Check if this is offset is covered by a COW extents, and if yes use

4
fs/xfs/xfs_bmap_util.c
View file

@ -554,7 +554,7 @@ xfs_bmap_punch_delalloc_range(
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
int error = 0; int error = 0;
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(!xfs_need_iread_extents(ifp));
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);
if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got)) if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got))
@ -625,7 +625,7 @@ xfs_can_free_eofblocks(
return false; return false;
/* If we haven't read in the extent list, then don't do it now. */ /* If we haven't read in the extent list, then don't do it now. */
if (!(ip->i_df.if_flags & XFS_IFEXTENTS)) if (xfs_need_iread_extents(&ip->i_df))
return false; return false;
/* /*

10
fs/xfs/xfs_inode.c
View file

@ -111,8 +111,7 @@ xfs_ilock_data_map_shared(
{ {
uint lock_mode = XFS_ILOCK_SHARED; uint lock_mode = XFS_ILOCK_SHARED;
if (ip->i_df.if_format == XFS_DINODE_FMT_BTREE && if (xfs_need_iread_extents(&ip->i_df))
(ip->i_df.if_flags & XFS_IFEXTENTS) == 0)
lock_mode = XFS_ILOCK_EXCL; lock_mode = XFS_ILOCK_EXCL;
xfs_ilock(ip, lock_mode); xfs_ilock(ip, lock_mode);
return lock_mode; return lock_mode;
@ -124,9 +123,7 @@ xfs_ilock_attr_map_shared(
{ {
uint lock_mode = XFS_ILOCK_SHARED; uint lock_mode = XFS_ILOCK_SHARED;
if (ip->i_afp && if (ip->i_afp && xfs_need_iread_extents(ip->i_afp))
ip->i_afp->if_format == XFS_DINODE_FMT_BTREE &&
(ip->i_afp->if_flags & XFS_IFEXTENTS) == 0)
lock_mode = XFS_ILOCK_EXCL; lock_mode = XFS_ILOCK_EXCL;
xfs_ilock(ip, lock_mode); xfs_ilock(ip, lock_mode);
return lock_mode; return lock_mode;
@ -843,7 +840,6 @@ xfs_init_new_inode(
case S_IFBLK: case S_IFBLK:
case S_IFSOCK: case S_IFSOCK:
ip->i_df.if_format = XFS_DINODE_FMT_DEV; ip->i_df.if_format = XFS_DINODE_FMT_DEV;
ip->i_df.if_flags = 0;
flags |= XFS_ILOG_DEV; flags |= XFS_ILOG_DEV;
break; break;
case S_IFREG: case S_IFREG:
@ -855,7 +851,6 @@ xfs_init_new_inode(
/* FALLTHROUGH */ /* FALLTHROUGH */
case S_IFLNK: case S_IFLNK:
ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS; ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS;
ip->i_df.if_flags = XFS_IFEXTENTS;
ip->i_df.if_bytes = 0; ip->i_df.if_bytes = 0;
ip->i_df.if_u1.if_root = NULL; ip->i_df.if_u1.if_root = NULL;
break; break;
@ -875,7 +870,6 @@ xfs_init_new_inode(
if (init_xattrs && xfs_sb_version_hasattr(&mp->m_sb)) { if (init_xattrs && xfs_sb_version_hasattr(&mp->m_sb)) {
ip->i_forkoff = xfs_default_attroffset(ip) >> 3; ip->i_forkoff = xfs_default_attroffset(ip) >> 3;
ip->i_afp = xfs_ifork_alloc(XFS_DINODE_FMT_EXTENTS, 0); ip->i_afp = xfs_ifork_alloc(XFS_DINODE_FMT_EXTENTS, 0);
ip->i_afp->if_flags = XFS_IFEXTENTS;
} }
/* /*

2
fs/xfs/xfs_ioctl.c
View file

@ -1126,7 +1126,7 @@ xfs_fill_fsxattr(
if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE) if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)
fa->fsx_cowextsize = XFS_FSB_TO_B(mp, ip->i_cowextsize); fa->fsx_cowextsize = XFS_FSB_TO_B(mp, ip->i_cowextsize);
fa->fsx_projid = ip->i_projid; fa->fsx_projid = ip->i_projid;
if (ifp && (ifp->if_flags & XFS_IFEXTENTS)) if (ifp && !xfs_need_iread_extents(ifp))
fa->fsx_nextents = xfs_iext_count(ifp); fa->fsx_nextents = xfs_iext_count(ifp);
else else
fa->fsx_nextents = xfs_ifork_nextents(ifp); fa->fsx_nextents = xfs_ifork_nextents(ifp);

4
fs/xfs/xfs_iomap.c
View file

@ -159,7 +159,7 @@ xfs_iomap_eof_align_last_fsb(
struct xfs_bmbt_irec irec; struct xfs_bmbt_irec irec;
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(!xfs_need_iread_extents(ifp));
/* /*
* Always round up the allocation request to the extent hint boundary. * Always round up the allocation request to the extent hint boundary.
@ -667,7 +667,7 @@ xfs_ilock_for_iomap(
* is an opencoded xfs_ilock_data_map_shared() call but with * is an opencoded xfs_ilock_data_map_shared() call but with
* non-blocking behaviour. * non-blocking behaviour.
*/ */
if (!(ip->i_df.if_flags & XFS_IFEXTENTS)) { if (xfs_need_iread_extents(&ip->i_df)) {
if (flags & IOMAP_NOWAIT) if (flags & IOMAP_NOWAIT)
return -EAGAIN; return -EAGAIN;
mode = XFS_ILOCK_EXCL; mode = XFS_ILOCK_EXCL;

2
fs/xfs/xfs_symlink.c
View file

@ -377,7 +377,7 @@ xfs_inactive_symlink_rmt(
xfs_trans_t *tp; xfs_trans_t *tp;
mp = ip->i_mount; mp = ip->i_mount;
ASSERT(ip->i_df.if_flags & XFS_IFEXTENTS); ASSERT(!xfs_need_iread_extents(&ip->i_df));
/* /*
* We're freeing a symlink that has some * We're freeing a symlink that has some
* blocks allocated to it. Free the * blocks allocated to it. Free the