Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xfs: prevent metadata files from being inactivated

Files containing metadata (quota records, rt bitmap and summary info)
are fully managed by the filesystem, which means that all resource
cleanup must be explicit, not automatic. This means that they should
never be subjected automatic to post-eof truncation, nor should they be
freed automatically even if the link count drops to zero.

In other words, xfs_inactive() should leave these files alone. Add the
necessary predicate functions to make this happen. This adds a second
layer of prevention for the kinds of fs corruption that was fixed by
commit f4c32e87de7d. If we ever decide to support removing metadata
files, we should make all those metadata updates explicit.

Rearrange the order of #includes to fix compiler errors, since
xfs_mount.h is supposed to be included before xfs_inode.h

Followup-to: f4c32e87de7d ("xfs: fix realtime bitmap/summary file truncation when growing rt volume")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

+15 -1
+1 -1
fs/xfs/libxfs/xfs_iext_tree.c
··· 8 8 #include "xfs_format.h" 9 9 #include "xfs_bit.h" 10 10 #include "xfs_log_format.h" 11 - #include "xfs_inode.h" 12 11 #include "xfs_trans_resv.h" 13 12 #include "xfs_mount.h" 13 + #include "xfs_inode.h" 14 14 #include "xfs_trace.h" 15 15 16 16 /*
+4
fs/xfs/xfs_inode.c
··· 1697 1697 if (mp->m_flags & XFS_MOUNT_RDONLY) 1698 1698 return; 1699 1699 1700 + /* Metadata inodes require explicit resource cleanup. */ 1701 + if (xfs_is_metadata_inode(ip)) 1702 + return; 1703 + 1700 1704 /* Try to clean out the cow blocks if there are any. */ 1701 1705 if (xfs_inode_has_cow_data(ip)) 1702 1706 xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, true);
+8
fs/xfs/xfs_inode.h
··· 185 185 return ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK; 186 186 } 187 187 188 + static inline bool xfs_is_metadata_inode(struct xfs_inode *ip) 189 + { 190 + struct xfs_mount *mp = ip->i_mount; 191 + 192 + return ip == mp->m_rbmip || ip == mp->m_rsumip || 193 + xfs_is_quota_inode(&mp->m_sb, ip->i_ino); 194 + } 195 + 188 196 /* 189 197 * Check if an inode has any data in the COW fork. This might be often false 190 198 * even for inodes with the reflink flag when there is no pending COW operation.
+2
fs/xfs/xfs_xattr.c
··· 9 9 #include "xfs_format.h" 10 10 #include "xfs_log_format.h" 11 11 #include "xfs_da_format.h" 12 + #include "xfs_trans_resv.h" 13 + #include "xfs_mount.h" 12 14 #include "xfs_inode.h" 13 15 #include "xfs_attr.h" 14 16 #include "xfs_acl.h"