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

Commit fd50092c authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: move xfs_fsb_to_db to xfs_bmap.h 



This is the only remaining useful function in xfs_rw.h, so move it
to a header file responsible for block mapping functions that the
callers already include. Soon we can get rid of xfs_rw.h.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 4ecbfe63

fs/xfs/xfs_bmap.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -6169,3 +6169,16 @@ xfs_bmap_punch_delalloc_range( 




	return error;

	return error;

}

}



/*

 * Convert the given file system block to a disk block.  We have to treat it

 * differently based on whether the file is a real time file or not, because the

 * bmap code does.

 */

xfs_daddr_t

xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)

{

	return (XFS_IS_REALTIME_INODE(ip) ? \

		 (xfs_daddr_t)XFS_FSB_TO_BB((ip)->i_mount, (fsb)) : \

		 XFS_FSB_TO_DADDR((ip)->i_mount, (fsb)));

}

fs/xfs/xfs_bmap.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,9 @@ int xfs_bmap_count_blocks(struct xfs_trans *tp, struct xfs_inode *ip, 
		int whichfork, int *count);

		int whichfork, int *count);

int	xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,

int	xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,

		xfs_fileoff_t start_fsb, xfs_fileoff_t length);

		xfs_fileoff_t start_fsb, xfs_fileoff_t length);



xfs_daddr_t xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb);



#endif	/* __KERNEL__ */

#endif	/* __KERNEL__ */





#endif	/* __XFS_BMAP_H__ */
 
#endif	/* __XFS_BMAP_H__ */

fs/xfs/xfs_rw.h

+0 −14
Original line number Original line Diff line number Diff line
@@ -22,20 +22,6 @@ struct xfs_buf; 
struct xfs_inode;

struct xfs_inode;

struct xfs_mount;

struct xfs_mount;





/*

 * Convert the given file system block to a disk block.

 * We have to treat it differently based on whether the

 * file is a real time file or not, because the bmap code

 * does.

 */

static inline xfs_daddr_t

xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)

{

	return (XFS_IS_REALTIME_INODE(ip) ? \

		 (xfs_daddr_t)XFS_FSB_TO_BB((ip)->i_mount, (fsb)) : \

		 XFS_FSB_TO_DADDR((ip)->i_mount, (fsb)));

}



/*

/*

 * Prototypes for functions in xfs_rw.c.

 * Prototypes for functions in xfs_rw.c.

 */

 */