Patch "xfs: mark the inode preallocated for pNFS write layouts past EOF" has been added to the 6.18-stable tree
Sasha Levin
AppliedThis is a note to let you know that I've just added the patch titled
xfs: mark the inode preallocated for pNFS write layouts past EOF
to the 6.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfs-mark-the-inode-preallocated-for-pnfs-write-layou.patch
and it can be found in the queue-6.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
commit 55e88c74391a9b0c0ca2e31c5e7a957289eaec3f
Author: Daejun Park <[email protected]> Date: Thu Oct 29 11:22:58 2026 +0900
xfs: mark the inode preallocated for pNFS write layouts past EOF
[ Upstream commit 8b8e265991556d99b6d721697f148975a7c68767 ]
xfs_fs_map_blocks() marks the inode XFS_DIFLAG_PREALLOC only when it allocates blocks for a write layout. A write layout past EOF can also hand out allocated blocks, such as speculative preallocation. blockgc then frees them under the layout, and another file may get them.
Mark the inode whenever a write mapping ends past EOF.
fs/xfs/xfs_pnfs.c +25 -9
@@ -110,7 +110,15 @@ xfs_fs_map_update_inode( ip->i_diflags |=XFS_DIFLAG_PREALLOC ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); -return xfs_trans_commit (tp); + error =xfs_trans_commit (tp); +if (error) +return error; + +/* +* Force the log so that the blocks handed out to the client are +* guaranteed to be present even after a server crash. +*/ +return xfs_log_force_inode (ip); }/*
@@ -135,6 +143,7 @@ xfs_fs_map_blocks(uint lock_flags;int error =0 ;u64 seq; +bool update_inode = false;if (xfs_is_shutdown (mp))return -EIO ;
@@ -203,20 +212,27 @@ xfs_fs_map_blocks( end_fsb - offset_fsb, 0, &imap, &seq);if (error) goto out_unlock; + update_inode = true; + }else { +xfs_iunlock (ip, lock_flags);/* -* Ensure the next transaction is committed synchronously so -* that the blocks allocated and handed out to the client are -* guaranteed to be present even after a server crash. +* Blocks past EOF that were allocated for buffered writes, such +* as speculative preallocation, can be freed by +* xfs_free_eofblocks() without breaking the layout unless the +* inode is marked as preallocated. Mark it before handing them +* out for writing, as for blocks allocated above. */ +if (write && !(ip->i_diflags &XFS_DIFLAG_PREALLOC ) && + imap.br_startoff + imap.br_blockcount > +XFS_B_TO_FSB (mp,XFS_ISIZE (ip))) + update_inode = true; + } + +if (update_inode) { error =xfs_fs_map_update_inode (ip); -if (!error) - error =xfs_log_force_inode (ip);if (error) goto out_unlock; - - }else { -xfs_iunlock (ip, lock_flags); }xfs_iunlock (ip,XFS_IOLOCK_EXCL );