diff options
Diffstat (limited to 'fs/xfs/libxfs/xfs_ialloc.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index de3f04a98656..3b57ef0f2f76 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -920,8 +920,7 @@ STATIC xfs_agnumber_t  xfs_ialloc_ag_select(  	xfs_trans_t	*tp,		/* transaction pointer */  	xfs_ino_t	parent,		/* parent directory inode number */ -	umode_t		mode,		/* bits set to indicate file type */ -	int		okalloc)	/* ok to allocate more space */ +	umode_t		mode)		/* bits set to indicate file type */  {  	xfs_agnumber_t	agcount;	/* number of ag's in the filesystem */  	xfs_agnumber_t	agno;		/* current ag number */ @@ -978,9 +977,6 @@ xfs_ialloc_ag_select(  			return agno;  		} -		if (!okalloc) -			goto nextag; -  		if (!pag->pagf_init) {  			error = xfs_alloc_pagf_init(mp, tp, agno, flags);  			if (error) @@ -1680,7 +1676,6 @@ xfs_dialloc(  	struct xfs_trans	*tp,  	xfs_ino_t		parent,  	umode_t			mode, -	int			okalloc,  	struct xfs_buf		**IO_agbp,  	xfs_ino_t		*inop)  { @@ -1692,6 +1687,7 @@ xfs_dialloc(  	int			noroom = 0;  	xfs_agnumber_t		start_agno;  	struct xfs_perag	*pag; +	int			okalloc = 1;  	if (*IO_agbp) {  		/* @@ -1707,7 +1703,7 @@ xfs_dialloc(  	 * We do not have an agbp, so select an initial allocation  	 * group for inode allocation.  	 */ -	start_agno = xfs_ialloc_ag_select(tp, parent, mode, okalloc); +	start_agno = xfs_ialloc_ag_select(tp, parent, mode);  	if (start_agno == NULLAGNUMBER) {  		*inop = NULLFSINO;  		return 0;  | 
