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

Commit ef35e925 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove xfs_iput_new 



We never get an i_mode of 0 or a locked VFS inode until we pass in the
XFS_IGET_CREATE flag to xfs_iget, which makes xfs_iput_new equivalent to
xfs_iput for the only caller.  In addition to that xfs_nfs_get_inode
does not even need to lock the inode given that the generation never changes
for a life inode, so just pass a 0 lock_flags to xfs_iget and release
the inode using IRELE in the error path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent d2e078c3

fs/xfs/linux-2.6/xfs_export.c

+3 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "xfs_inode_item.h"

#include "xfs_trace.h"



/*

 * Note that we only accept fileids which are long enough rather than allow
@@ -131,8 +132,7 @@ xfs_nfs_get_inode( 
	 * fine and not an indication of a corrupted filesystem as clients can

	 * send invalid file handles and we have to handle it gracefully..

	 */

	error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED,

			 XFS_ILOCK_SHARED, &ip);

	error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED, 0, &ip);

	if (error) {

		/*

		 * EINVAL means the inode cluster doesn't exist anymore.
@@ -147,11 +147,10 @@ xfs_nfs_get_inode( 
	}



	if (ip->i_d.di_gen != generation) {

		xfs_iput_new(ip, XFS_ILOCK_SHARED);

		IRELE(ip);

		return ERR_PTR(-ENOENT);

	}



	xfs_iunlock(ip, XFS_ILOCK_SHARED);

	return VFS_I(ip);

}

fs/xfs/xfs_iget.c

+0 −23
Original line number Diff line number Diff line
@@ -434,29 +434,6 @@ xfs_iput(xfs_inode_t *ip, 
	IRELE(ip);

}



/*

 * Special iput for brand-new inodes that are still locked

 */

void

xfs_iput_new(

	xfs_inode_t	*ip,

	uint		lock_flags)

{

	struct inode	*inode = VFS_I(ip);



	xfs_itrace_entry(ip);



	if ((ip->i_d.di_mode == 0)) {

		ASSERT(!xfs_iflags_test(ip, XFS_IRECLAIMABLE));

		make_bad_inode(inode);

	}

	if (inode->i_state & I_NEW)

		unlock_new_inode(inode);

	if (lock_flags)

		xfs_iunlock(ip, lock_flags);

	IRELE(ip);

}



/*

 * This is called free all the memory associated with an inode.

 * It must free the inode itself and any buffers allocated for

fs/xfs/xfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ static inline void xfs_ifunlock(xfs_inode_t *ip) 
int		xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,

			 uint, uint, xfs_inode_t **);

void		xfs_iput(xfs_inode_t *, uint);

void		xfs_iput_new(xfs_inode_t *, uint);

void		xfs_ilock(xfs_inode_t *, uint);

int		xfs_ilock_nowait(xfs_inode_t *, uint);

void		xfs_iunlock(xfs_inode_t *, uint);