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

xfs: hoist xfs_{bump,drop}link to libxfs 



Move xfs_bumplink and xfs_droplink to libxfs.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent b8a61079

fs/xfs/libxfs/xfs_inode_util.c

+53 −0
Original line number Diff line number Diff line
@@ -626,3 +626,56 @@ xfs_iunlink_remove( 


	return xfs_iunlink_remove_inode(tp, pag, agibp, ip);

}



/*

 * Decrement the link count on an inode & log the change.  If this causes the

 * link count to go to zero, move the inode to AGI unlinked list so that it can

 * be freed when the last active reference goes away via xfs_inactive().

 */

int

xfs_droplink(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	struct inode		*inode = VFS_I(ip);



	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);



	if (inode->i_nlink == 0) {

		xfs_info_ratelimited(tp->t_mountp,

 "Inode 0x%llx link count dropped below zero.  Pinning link count.",

				ip->i_ino);

		set_nlink(inode, XFS_NLINK_PINNED);

	}

	if (inode->i_nlink != XFS_NLINK_PINNED)

		drop_nlink(inode);



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (inode->i_nlink)

		return 0;



	return xfs_iunlink(tp, ip);

}



/*

 * Increment the link count on an inode & log the change.

 */

void

xfs_bumplink(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	struct inode		*inode = VFS_I(ip);



	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);



	if (inode->i_nlink == XFS_NLINK_PINNED - 1)

		xfs_info_ratelimited(tp->t_mountp,

 "Inode 0x%llx link count exceeded maximum.  Pinning link count.",

				ip->i_ino);

	if (inode->i_nlink != XFS_NLINK_PINNED)

		inc_nlink(inode);



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

}

fs/xfs/libxfs/xfs_inode_util.h

+2 −0
Original line number Diff line number Diff line
@@ -50,5 +50,7 @@ void xfs_inode_init(struct xfs_trans *tp, const struct xfs_icreate_args *args, 
int xfs_iunlink(struct xfs_trans *tp, struct xfs_inode *ip);

int xfs_iunlink_remove(struct xfs_trans *tp, struct xfs_perag *pag,

		struct xfs_inode *ip);

int xfs_droplink(struct xfs_trans *tp, struct xfs_inode *ip);

void xfs_bumplink(struct xfs_trans *tp, struct xfs_inode *ip);



#endif /* __XFS_INODE_UTIL_H__ */

fs/xfs/xfs_inode.c

+0 −53
Original line number Diff line number Diff line
@@ -600,59 +600,6 @@ xfs_icreate( 
	return 0;

}



/*

 * Decrement the link count on an inode & log the change.  If this causes the

 * link count to go to zero, move the inode to AGI unlinked list so that it can

 * be freed when the last active reference goes away via xfs_inactive().

 */

int

xfs_droplink(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	struct inode		*inode = VFS_I(ip);



	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);



	if (inode->i_nlink == 0) {

		xfs_info_ratelimited(tp->t_mountp,

 "Inode 0x%llx link count dropped below zero.  Pinning link count.",

				ip->i_ino);

		set_nlink(inode, XFS_NLINK_PINNED);

	}

	if (inode->i_nlink != XFS_NLINK_PINNED)

		drop_nlink(inode);



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (inode->i_nlink)

		return 0;



	return xfs_iunlink(tp, ip);

}



/*

 * Increment the link count on an inode & log the change.

 */

void

xfs_bumplink(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	struct inode		*inode = VFS_I(ip);



	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);



	if (inode->i_nlink == XFS_NLINK_PINNED - 1)

		xfs_info_ratelimited(tp->t_mountp,

 "Inode 0x%llx link count exceeded maximum.  Pinning link count.",

				ip->i_ino);

	if (inode->i_nlink != XFS_NLINK_PINNED)

		inc_nlink(inode);



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

}



#ifdef CONFIG_XFS_LIVE_HOOKS

/*

 * Use a static key here to reduce the overhead of directory live update hooks.

fs/xfs/xfs_inode.h

+0 −2
Original line number Diff line number Diff line
@@ -615,8 +615,6 @@ void xfs_end_io(struct work_struct *work); 
int xfs_ilock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2);

void xfs_iunlock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2);

void xfs_iunlock2_remapping(struct xfs_inode *ip1, struct xfs_inode *ip2);

int xfs_droplink(struct xfs_trans *tp, struct xfs_inode *ip);

void xfs_bumplink(struct xfs_trans *tp, struct xfs_inode *ip);

void xfs_lock_inodes(struct xfs_inode **ips, int inodes, uint lock_mode);

void xfs_sort_inodes(struct xfs_inode **i_tab, unsigned int num_inodes);