Commit 9bbafc71 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: move xfs_perag_get/put to xfs_ag.[ch] 



They are AG functions, not superblock functions, so move them to the
appropriate location.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent d07f6ca9

fs/xfs/libxfs/xfs_ag.c

+135 −0
Original line number Diff line number Diff line
@@ -27,6 +27,141 @@ 
#include "xfs_defer.h"

#include "xfs_log_format.h"

#include "xfs_trans.h"

#include "xfs_trace.h"



/*

 * Passive reference counting access wrappers to the perag structures.  If the

 * per-ag structure is to be freed, the freeing code is responsible for cleaning

 * up objects with passive references before freeing the structure. This is

 * things like cached buffers.

 */

struct xfs_perag *

xfs_perag_get(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno)

{

	struct xfs_perag	*pag;

	int			ref = 0;



	rcu_read_lock();

	pag = radix_tree_lookup(&mp->m_perag_tree, agno);

	if (pag) {

		ASSERT(atomic_read(&pag->pag_ref) >= 0);

		ref = atomic_inc_return(&pag->pag_ref);

	}

	rcu_read_unlock();

	trace_xfs_perag_get(mp, agno, ref, _RET_IP_);

	return pag;

}



/*

 * search from @first to find the next perag with the given tag set.

 */

struct xfs_perag *

xfs_perag_get_tag(

	struct xfs_mount	*mp,

	xfs_agnumber_t		first,

	int			tag)

{

	struct xfs_perag	*pag;

	int			found;

	int			ref;



	rcu_read_lock();

	found = radix_tree_gang_lookup_tag(&mp->m_perag_tree,

					(void **)&pag, first, 1, tag);

	if (found <= 0) {

		rcu_read_unlock();

		return NULL;

	}

	ref = atomic_inc_return(&pag->pag_ref);

	rcu_read_unlock();

	trace_xfs_perag_get_tag(mp, pag->pag_agno, ref, _RET_IP_);

	return pag;

}



void

xfs_perag_put(

	struct xfs_perag	*pag)

{

	int	ref;



	ASSERT(atomic_read(&pag->pag_ref) > 0);

	ref = atomic_dec_return(&pag->pag_ref);

	trace_xfs_perag_put(pag->pag_mount, pag->pag_agno, ref, _RET_IP_);

}



/*

 * xfs_initialize_perag_data

 *

 * Read in each per-ag structure so we can count up the number of

 * allocated inodes, free inodes and used filesystem blocks as this

 * information is no longer persistent in the superblock. Once we have

 * this information, write it into the in-core superblock structure.

 */

int

xfs_initialize_perag_data(

	struct xfs_mount *mp,

	xfs_agnumber_t	agcount)

{

	xfs_agnumber_t	index;

	xfs_perag_t	*pag;

	xfs_sb_t	*sbp = &mp->m_sb;

	uint64_t	ifree = 0;

	uint64_t	ialloc = 0;

	uint64_t	bfree = 0;

	uint64_t	bfreelst = 0;

	uint64_t	btree = 0;

	uint64_t	fdblocks;

	int		error = 0;



	for (index = 0; index < agcount; index++) {

		/*

		 * read the agf, then the agi. This gets us

		 * all the information we need and populates the

		 * per-ag structures for us.

		 */

		error = xfs_alloc_pagf_init(mp, NULL, index, 0);

		if (error)

			return error;



		error = xfs_ialloc_pagi_init(mp, NULL, index);

		if (error)

			return error;

		pag = xfs_perag_get(mp, index);

		ifree += pag->pagi_freecount;

		ialloc += pag->pagi_count;

		bfree += pag->pagf_freeblks;

		bfreelst += pag->pagf_flcount;

		btree += pag->pagf_btreeblks;

		xfs_perag_put(pag);

	}

	fdblocks = bfree + bfreelst + btree;



	/*

	 * If the new summary counts are obviously incorrect, fail the

	 * mount operation because that implies the AGFs are also corrupt.

	 * Clear FS_COUNTERS so that we don't unmount with a dirty log, which

	 * will prevent xfs_repair from fixing anything.

	 */

	if (fdblocks > sbp->sb_dblocks || ifree > ialloc) {

		xfs_alert(mp, "AGF corruption. Please run xfs_repair.");

		error = -EFSCORRUPTED;

		goto out;

	}



	/* Overwrite incore superblock counters with just-read data */

	spin_lock(&mp->m_sb_lock);

	sbp->sb_ifree = ifree;

	sbp->sb_icount = ialloc;

	sbp->sb_fdblocks = fdblocks;

	spin_unlock(&mp->m_sb_lock);



	xfs_reinit_percpu_counters(mp);

out:

	xfs_fs_mark_healthy(mp, XFS_SICK_FS_COUNTERS);

	return error;

}



static int

xfs_get_aghdr_buf(

fs/xfs/libxfs/xfs_ag.h

+10 −0
Original line number Diff line number Diff line
@@ -9,6 +9,16 @@ 


struct xfs_mount;

struct xfs_trans;

struct xfs_perag;



/*

 * perag get/put wrappers for ref counting

 */

int	xfs_initialize_perag_data(struct xfs_mount *, xfs_agnumber_t);

struct xfs_perag *xfs_perag_get(struct xfs_mount *, xfs_agnumber_t);

struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *, xfs_agnumber_t,

				   int tag);

void	xfs_perag_put(struct xfs_perag *pag);



struct aghdr_init_data {

	/* per ag data */

fs/xfs/libxfs/xfs_ag_resv.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "xfs_btree.h"

#include "xfs_refcount_btree.h"

#include "xfs_ialloc_btree.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_ag_resv.h"



/*

fs/xfs/libxfs/xfs_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "xfs_shared.h"

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_btree.h"
@@ -24,6 +23,7 @@ 
#include "xfs_trans.h"

#include "xfs_buf_item.h"

#include "xfs_log.h"

#include "xfs_ag.h"

#include "xfs_ag_resv.h"

#include "xfs_bmap.h"

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_btree.h"

#include "xfs_btree_staging.h"
@@ -19,6 +18,7 @@ 
#include "xfs_error.h"

#include "xfs_trace.h"

#include "xfs_trans.h"

#include "xfs_ag.h"





STATIC struct xfs_btree_cur *