Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e7e605c authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: cancel pending CoW reservations when destroying inodes 



When destroying the inode, cancel all pending reservations in the CoW
fork so that all the reserved blocks go back to the free pile.  In
theory this sort of cleanup is only needed to clean up after write
errors.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent aa8968f2

fs/xfs/xfs_super.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "xfs_rmap_item.h"

#include "xfs_rmap_item.h"

#include "xfs_refcount_item.h"

#include "xfs_refcount_item.h"

#include "xfs_bmap_item.h"

#include "xfs_bmap_item.h"

#include "xfs_reflink.h"





#include <linux/namei.h>

#include <linux/namei.h>

#include <linux/init.h>

#include <linux/init.h>
@@ -938,6 +939,7 @@ xfs_fs_destroy_inode( 
	struct inode		*inode)

	struct inode		*inode)

{

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_inode	*ip = XFS_I(inode);

	int			error;





	trace_xfs_destroy_inode(ip);

	trace_xfs_destroy_inode(ip);
@@ -945,6 +947,12 @@ xfs_fs_destroy_inode( 
	XFS_STATS_INC(ip->i_mount, vn_rele);

	XFS_STATS_INC(ip->i_mount, vn_rele);

	XFS_STATS_INC(ip->i_mount, vn_remove);

	XFS_STATS_INC(ip->i_mount, vn_remove);





	error = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF);

	if (error && !XFS_FORCED_SHUTDOWN(ip->i_mount))

		xfs_warn(ip->i_mount, "Error %d while evicting CoW blocks "

				"for inode %llu.",

				error, ip->i_ino);



	xfs_inactive(ip);

	xfs_inactive(ip);





	ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0);

	ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0);