xfs: move xfs_dialloc_roll() into xfs_dialloc()
Get rid of the confusing ialloc_context and failure handling around xfs_dialloc() by moving xfs_dialloc_roll() into xfs_dialloc(). Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Gao Xiang <hsiangkao@redhat.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
committed by
Darrick J. Wong
parent
1abcf26101
commit
f3bf6e0f11
@@ -32,39 +32,20 @@ xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o)
|
||||
return xfs_buf_offset(b, o << (mp)->m_sb.sb_inodelog);
|
||||
}
|
||||
|
||||
int
|
||||
xfs_dialloc_roll(
|
||||
struct xfs_trans **tpp,
|
||||
struct xfs_buf *agibp);
|
||||
|
||||
/*
|
||||
* Allocate an inode on disk.
|
||||
* Mode is used to tell whether the new inode will need space, and whether
|
||||
* it is a directory.
|
||||
*
|
||||
* To work within the constraint of one allocation per transaction,
|
||||
* xfs_dialloc() is designed to be called twice if it has to do an
|
||||
* allocation to make more free inodes. If an inode is
|
||||
* available without an allocation, agbp would be set to the current
|
||||
* agbp and alloc_done set to false.
|
||||
* If an allocation needed to be done, agbp would be set to the
|
||||
* inode header of the allocation group and alloc_done set to true.
|
||||
* The caller should then commit the current transaction and allocate a new
|
||||
* transaction. xfs_dialloc() should then be called again with
|
||||
* the agbp value returned from the previous call.
|
||||
*
|
||||
* Once we successfully pick an inode its number is returned and the
|
||||
* on-disk data structures are updated. The inode itself is not read
|
||||
* in, since doing so would break ordering constraints with xfs_reclaim.
|
||||
*
|
||||
* *agbp should be set to NULL on the first call, *alloc_done set to FALSE.
|
||||
*/
|
||||
int /* error */
|
||||
xfs_dialloc(
|
||||
struct xfs_trans *tp, /* transaction pointer */
|
||||
struct xfs_trans **tpp, /* double pointer of transaction */
|
||||
xfs_ino_t parent, /* parent inode (directory) */
|
||||
umode_t mode, /* mode bits for new inode */
|
||||
struct xfs_buf **agbp, /* buf for a.g. inode header */
|
||||
xfs_ino_t *inop); /* inode number allocated */
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user