Skip to content

Commit 0b10d8a

Browse files
Brian Fosterdjwong
authored andcommitted
xfs: log the inode on directory sf to block format change
When a directory changes from shortform (sf) to block format, the sf format is copied to a temporary buffer, the inode format is modified and the updated format filled with the dentries from the temporary buffer. If the inode format is modified and attempt to grow the inode fails (due to I/O error, for example), it is possible to return an error while leaving the directory in an inconsistent state and with an otherwise clean transaction. This results in corruption of the associated directory and leads to xfs_dabuf_map() errors as subsequent lookups cannot accurately determine the format of the directory. This problem is reproduced occasionally by generic/475. The fundamental problem is that xfs_dir2_sf_to_block() changes the on-disk inode format without logging the inode. The inode is eventually logged by the bmapi layer in the common case, but error checking introduces the possibility of failing the high level request before this happens. Update both of the dir2 and attr callers of xfs_bmap_local_to_extents_empty() to log the inode core as consistent with the bmap local to extent format change codepath. This ensures that any subsequent errors after the format has changed cause the transaction to abort. Signed-off-by: Brian Foster <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
1 parent 3219e8c commit 0b10d8a

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

fs/xfs/libxfs/xfs_attr_leaf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,7 @@ xfs_attr_shortform_to_leaf(
827827

828828
xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
829829
xfs_bmap_local_to_extents_empty(dp, XFS_ATTR_FORK);
830+
xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE);
830831

831832
bp = NULL;
832833
error = xfs_da_grow_inode(args, &blkno);

fs/xfs/libxfs/xfs_dir2_block.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,7 @@ xfs_dir2_sf_to_block(
10981098
xfs_idata_realloc(dp, -ifp->if_bytes, XFS_DATA_FORK);
10991099
xfs_bmap_local_to_extents_empty(dp, XFS_DATA_FORK);
11001100
dp->i_d.di_size = 0;
1101+
xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE);
11011102

11021103
/*
11031104
* Add block 0 to the inode.

0 commit comments

Comments
 (0)