mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
[XFS] free partially initialized inodes using destroy_inode
To make sure we free the security data inodes need to be freed using the proper VFS helper (which we also need to export for this). We mark these inodes bad so we can skip the flush path for them. SGI-PV: 987246 SGI-Modid: xfs-linux-melb:xfs-kern:32398a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: David Chinner <david@fromorbit.com>
This commit is contained in:
parent
087e3b0460
commit
9ed0451ee0
3 changed files with 29 additions and 11 deletions
|
@ -201,7 +201,7 @@ xfs_iget_cache_miss(
|
|||
if (lock_flags)
|
||||
xfs_iunlock(ip, lock_flags);
|
||||
out_destroy:
|
||||
xfs_idestroy(ip);
|
||||
xfs_destroy_inode(ip);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
@ -898,18 +898,14 @@ xfs_iread(
|
|||
* know that this is a new incore inode.
|
||||
*/
|
||||
error = xfs_itobp(mp, tp, ip, &dip, &bp, bno, imap_flags, XFS_BUF_LOCK);
|
||||
if (error) {
|
||||
xfs_idestroy(ip);
|
||||
return error;
|
||||
}
|
||||
if (error)
|
||||
goto out_destroy_inode;
|
||||
|
||||
/*
|
||||
* If we got something that isn't an inode it means someone
|
||||
* (nfs or dmi) has a stale handle.
|
||||
*/
|
||||
if (be16_to_cpu(dip->di_core.di_magic) != XFS_DINODE_MAGIC) {
|
||||
xfs_idestroy(ip);
|
||||
xfs_trans_brelse(tp, bp);
|
||||
#ifdef DEBUG
|
||||
xfs_fs_cmn_err(CE_ALERT, mp, "xfs_iread: "
|
||||
"dip->di_core.di_magic (0x%x) != "
|
||||
|
@ -917,7 +913,8 @@ xfs_iread(
|
|||
be16_to_cpu(dip->di_core.di_magic),
|
||||
XFS_DINODE_MAGIC);
|
||||
#endif /* DEBUG */
|
||||
return XFS_ERROR(EINVAL);
|
||||
error = XFS_ERROR(EINVAL);
|
||||
goto out_brelse;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -931,14 +928,12 @@ xfs_iread(
|
|||
xfs_dinode_from_disk(&ip->i_d, &dip->di_core);
|
||||
error = xfs_iformat(ip, dip);
|
||||
if (error) {
|
||||
xfs_idestroy(ip);
|
||||
xfs_trans_brelse(tp, bp);
|
||||
#ifdef DEBUG
|
||||
xfs_fs_cmn_err(CE_ALERT, mp, "xfs_iread: "
|
||||
"xfs_iformat() returned error %d",
|
||||
error);
|
||||
#endif /* DEBUG */
|
||||
return error;
|
||||
goto out_brelse;
|
||||
}
|
||||
} else {
|
||||
ip->i_d.di_magic = be16_to_cpu(dip->di_core.di_magic);
|
||||
|
@ -1004,6 +999,12 @@ xfs_iread(
|
|||
xfs_trans_brelse(tp, bp);
|
||||
*ipp = ip;
|
||||
return 0;
|
||||
|
||||
out_brelse:
|
||||
xfs_trans_brelse(tp, bp);
|
||||
out_destroy_inode:
|
||||
xfs_destroy_inode(ip);
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -309,6 +309,23 @@ static inline struct inode *VFS_I(struct xfs_inode *ip)
|
|||
return &ip->i_vnode;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get rid of a partially initialized inode.
|
||||
*
|
||||
* We have to go through destroy_inode to make sure allocations
|
||||
* from init_inode_always like the security data are undone.
|
||||
*
|
||||
* We mark the inode bad so that it takes the short cut in
|
||||
* the reclaim path instead of going through the flush path
|
||||
* which doesn't make sense for an inode that has never seen the
|
||||
* light of day.
|
||||
*/
|
||||
static inline void xfs_destroy_inode(struct xfs_inode *ip)
|
||||
{
|
||||
make_bad_inode(VFS_I(ip));
|
||||
return destroy_inode(VFS_I(ip));
|
||||
}
|
||||
|
||||
/*
|
||||
* i_flags helper functions
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue