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

Commit 0f9fffbc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott
Browse files

[XFS] remove some dead code from pagebuf 



SGI-PV: 934766
SGI-Modid: xfs-linux:xfs-kern:197783a

Signed-off-by: default avatarChristoph Hellwig <hch@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 02ba71de

fs/xfs/linux-2.6/xfs_buf.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -699,25 +699,6 @@ xfs_buf_read_flags( 
	return NULL;

	return NULL;

}

}





/*

 * Create a skeletal pagebuf (no pages associated with it).

 */

xfs_buf_t *

pagebuf_lookup(

	xfs_buftarg_t		*target,

	loff_t			ioff,

	size_t			isize,

	page_buf_flags_t	flags)

{

	xfs_buf_t		*pb;



	pb = pagebuf_allocate(flags);

	if (pb) {

		_pagebuf_initialize(pb, target, ioff, isize, flags);

	}

	return pb;

}



/*

/*

 * If we are not low on memory then do the readahead in a deadlock

 * If we are not low on memory then do the readahead in a deadlock

 * safe manner.

 * safe manner.
@@ -891,17 +872,6 @@ pagebuf_rele( 




	PB_TRACE(pb, "rele", pb->pb_relse);

	PB_TRACE(pb, "rele", pb->pb_relse);





	/*

	 * pagebuf_lookup buffers are not hashed, not delayed write,

	 * and don't have their own release routines.  Special case.

	 */

	if (unlikely(!hash)) {

		ASSERT(!pb->pb_relse);

		if (atomic_dec_and_test(&pb->pb_hold))

			xfs_buf_free(pb);

		return;

	}



	if (atomic_dec_and_lock(&pb->pb_hold, &hash->bh_lock)) {

	if (atomic_dec_and_lock(&pb->pb_hold, &hash->bh_lock)) {

		int		do_free = 1;

		int		do_free = 1;

fs/xfs/linux-2.6/xfs_buf.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -206,13 +206,6 @@ extern xfs_buf_t *xfs_buf_read_flags( /* allocate and read a buffer */ 
#define xfs_buf_read(target, blkno, len, flags) \

#define xfs_buf_read(target, blkno, len, flags) \

	xfs_buf_read_flags((target), (blkno), (len), PBF_LOCK | PBF_MAPPED)

	xfs_buf_read_flags((target), (blkno), (len), PBF_LOCK | PBF_MAPPED)





extern xfs_buf_t *pagebuf_lookup(

		xfs_buftarg_t *,

		loff_t,			/* starting offset of range	*/

		size_t,			/* length of range		*/

		page_buf_flags_t);	/* PBF_READ, PBF_WRITE,		*/

					/* PBF_FORCEIO, 		*/



extern xfs_buf_t *pagebuf_get_empty(	/* allocate pagebuf struct with	*/

extern xfs_buf_t *pagebuf_get_empty(	/* allocate pagebuf struct with	*/

					/*  no memory or disk address	*/

					/*  no memory or disk address	*/

		size_t len,

		size_t len,