diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-08-30 14:57:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-08-30 14:57:03 +0200 |
| commit | a8729efbbb847f6ea9b06e73491ec8ddb560465e (patch) | |
| tree | c2e172452158457ab238080405060110934ad9d1 /fs/xfs/xfs_inode.c | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| parent | Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus (diff) | |
| download | wireguard-linux-a8729efbbb847f6ea9b06e73491ec8ddb560465e.tar.xz wireguard-linux-a8729efbbb847f6ea9b06e73491ec8ddb560465e.zip | |
Merge tag 'asoc-v5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.15
Quite a quiet release this time, mostly a combination of cleanups
and a good set of new drivers.
- Lots of cleanups and improvements to the Intel drivers,
including some new systems support.
- New support for AMD Vangoh, CUI CMM-4030D-261, Mediatek
Mt8195, Renesas RZ/G2L Mediatek Mt8195, RealTek RT101P,
Renesas RZ/G2L,, Rockchip RK3568 S/PDIF.
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a835ceb79ba5..990b72ae3635 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2763,6 +2763,19 @@ xfs_remove( error = xfs_droplink(tp, ip); if (error) goto out_trans_cancel; + + /* + * Point the unlinked child directory's ".." entry to the root + * directory to eliminate back-references to inodes that may + * get freed before the child directory is closed. If the fs + * gets shrunk, this can lead to dirent inode validation errors. + */ + if (dp->i_ino != tp->t_mountp->m_sb.sb_rootino) { + error = xfs_dir_replace(tp, ip, &xfs_name_dotdot, + tp->t_mountp->m_sb.sb_rootino, 0); + if (error) + return error; + } } else { /* * When removing a non-directory we need to log the parent |