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

Commit bdf28630 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: add refcount btree operations 



Implement the generic btree operations required to manipulate refcount
btree blocks.  The implementation is similar to the bmapbt, though it
will only allocate and free blocks from the AG.

Since the refcount root and level fields are separate from the
existing roots and levels array, they need a separate logging flag.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[hch: fix logging of AGF refcount btree fields]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f310bd2e

fs/xfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ xfs-y += $(addprefix libxfs/, \ 
				   xfs_ag_resv.o \

				   xfs_rmap.o \

				   xfs_rmap_btree.o \

				   xfs_refcount.o \

				   xfs_refcount_btree.o \

				   xfs_sb.o \

				   xfs_symlink_remote.o \

fs/xfs/libxfs/xfs_alloc.c

+3 −0
Original line number Diff line number Diff line
@@ -2334,6 +2334,9 @@ xfs_alloc_log_agf( 
		offsetof(xfs_agf_t, agf_btreeblks),

		offsetof(xfs_agf_t, agf_uuid),

		offsetof(xfs_agf_t, agf_rmap_blocks),

		offsetof(xfs_agf_t, agf_refcount_blocks),

		offsetof(xfs_agf_t, agf_refcount_root),

		offsetof(xfs_agf_t, agf_refcount_level),

		/* needed so that we don't log the whole rest of the structure: */

		offsetof(xfs_agf_t, agf_spare64),

		sizeof(xfs_agf_t)

fs/xfs/libxfs/xfs_format.h

+8 −2
Original line number Diff line number Diff line
@@ -684,8 +684,11 @@ typedef struct xfs_agf { 
#define	XFS_AGF_BTREEBLKS	0x00000800

#define	XFS_AGF_UUID		0x00001000

#define	XFS_AGF_RMAP_BLOCKS	0x00002000

#define	XFS_AGF_SPARE64		0x00004000

#define	XFS_AGF_NUM_BITS	15

#define	XFS_AGF_REFCOUNT_BLOCKS	0x00004000

#define	XFS_AGF_REFCOUNT_ROOT	0x00008000

#define	XFS_AGF_REFCOUNT_LEVEL	0x00010000

#define	XFS_AGF_SPARE64		0x00020000

#define	XFS_AGF_NUM_BITS	18

#define	XFS_AGF_ALL_BITS	((1 << XFS_AGF_NUM_BITS) - 1)



#define XFS_AGF_FLAGS \
@@ -703,6 +706,9 @@ typedef struct xfs_agf { 
	{ XFS_AGF_BTREEBLKS,	"BTREEBLKS" }, \

	{ XFS_AGF_UUID,		"UUID" }, \

	{ XFS_AGF_RMAP_BLOCKS,	"RMAP_BLOCKS" }, \

	{ XFS_AGF_REFCOUNT_BLOCKS,	"REFCOUNT_BLOCKS" }, \

	{ XFS_AGF_REFCOUNT_ROOT,	"REFCOUNT_ROOT" }, \

	{ XFS_AGF_REFCOUNT_LEVEL,	"REFCOUNT_LEVEL" }, \

	{ XFS_AGF_SPARE64,	"SPARE64" }



/* disk block (xfs_daddr_t) in the AG */

fs/xfs/libxfs/xfs_refcount.c

0 → 100644
+177 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Oracle.  All Rights Reserved.

 *

 * Author: Darrick J. Wong <darrick.wong@oracle.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.

 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_shared.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_btree.h"

#include "xfs_bmap.h"

#include "xfs_refcount_btree.h"

#include "xfs_alloc.h"

#include "xfs_error.h"

#include "xfs_trace.h"

#include "xfs_cksum.h"

#include "xfs_trans.h"

#include "xfs_bit.h"

#include "xfs_refcount.h"



/*

 * Look up the first record less than or equal to [bno, len] in the btree

 * given by cur.

 */

int

xfs_refcount_lookup_le(

	struct xfs_btree_cur	*cur,

	xfs_agblock_t		bno,

	int			*stat)

{

	trace_xfs_refcount_lookup(cur->bc_mp, cur->bc_private.a.agno, bno,

			XFS_LOOKUP_LE);

	cur->bc_rec.rc.rc_startblock = bno;

	cur->bc_rec.rc.rc_blockcount = 0;

	return xfs_btree_lookup(cur, XFS_LOOKUP_LE, stat);

}



/*

 * Look up the first record greater than or equal to [bno, len] in the btree

 * given by cur.

 */

int

xfs_refcount_lookup_ge(

	struct xfs_btree_cur	*cur,

	xfs_agblock_t		bno,

	int			*stat)

{

	trace_xfs_refcount_lookup(cur->bc_mp, cur->bc_private.a.agno, bno,

			XFS_LOOKUP_GE);

	cur->bc_rec.rc.rc_startblock = bno;

	cur->bc_rec.rc.rc_blockcount = 0;

	return xfs_btree_lookup(cur, XFS_LOOKUP_GE, stat);

}



/*

 * Get the data from the pointed-to record.

 */

int

xfs_refcount_get_rec(

	struct xfs_btree_cur		*cur,

	struct xfs_refcount_irec	*irec,

	int				*stat)

{

	union xfs_btree_rec	*rec;

	int			error;



	error = xfs_btree_get_rec(cur, &rec, stat);

	if (!error && *stat == 1) {

		irec->rc_startblock = be32_to_cpu(rec->refc.rc_startblock);

		irec->rc_blockcount = be32_to_cpu(rec->refc.rc_blockcount);

		irec->rc_refcount = be32_to_cpu(rec->refc.rc_refcount);

		trace_xfs_refcount_get(cur->bc_mp, cur->bc_private.a.agno,

				irec);

	}

	return error;

}



/*

 * Update the record referred to by cur to the value given

 * by [bno, len, refcount].

 * This either works (return 0) or gets an EFSCORRUPTED error.

 */

STATIC int

xfs_refcount_update(

	struct xfs_btree_cur		*cur,

	struct xfs_refcount_irec	*irec)

{

	union xfs_btree_rec	rec;

	int			error;



	trace_xfs_refcount_update(cur->bc_mp, cur->bc_private.a.agno, irec);

	rec.refc.rc_startblock = cpu_to_be32(irec->rc_startblock);

	rec.refc.rc_blockcount = cpu_to_be32(irec->rc_blockcount);

	rec.refc.rc_refcount = cpu_to_be32(irec->rc_refcount);

	error = xfs_btree_update(cur, &rec);

	if (error)

		trace_xfs_refcount_update_error(cur->bc_mp,

				cur->bc_private.a.agno, error, _RET_IP_);

	return error;

}



/*

 * Insert the record referred to by cur to the value given

 * by [bno, len, refcount].

 * This either works (return 0) or gets an EFSCORRUPTED error.

 */

STATIC int

xfs_refcount_insert(

	struct xfs_btree_cur		*cur,

	struct xfs_refcount_irec	*irec,

	int				*i)

{

	int				error;



	trace_xfs_refcount_insert(cur->bc_mp, cur->bc_private.a.agno, irec);

	cur->bc_rec.rc.rc_startblock = irec->rc_startblock;

	cur->bc_rec.rc.rc_blockcount = irec->rc_blockcount;

	cur->bc_rec.rc.rc_refcount = irec->rc_refcount;

	error = xfs_btree_insert(cur, i);

	XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, *i == 1, out_error);

out_error:

	if (error)

		trace_xfs_refcount_insert_error(cur->bc_mp,

				cur->bc_private.a.agno, error, _RET_IP_);

	return error;

}



/*

 * Remove the record referred to by cur, then set the pointer to the spot

 * where the record could be re-inserted, in case we want to increment or

 * decrement the cursor.

 * This either works (return 0) or gets an EFSCORRUPTED error.

 */

STATIC int

xfs_refcount_delete(

	struct xfs_btree_cur	*cur,

	int			*i)

{

	struct xfs_refcount_irec	irec;

	int			found_rec;

	int			error;



	error = xfs_refcount_get_rec(cur, &irec, &found_rec);

	if (error)

		goto out_error;

	XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, found_rec == 1, out_error);

	trace_xfs_refcount_delete(cur->bc_mp, cur->bc_private.a.agno, &irec);

	error = xfs_btree_delete(cur, i);

	XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, *i == 1, out_error);

	if (error)

		goto out_error;

	error = xfs_refcount_lookup_ge(cur, irec.rc_startblock, &found_rec);

out_error:

	if (error)

		trace_xfs_refcount_delete_error(cur->bc_mp,

				cur->bc_private.a.agno, error, _RET_IP_);

	return error;

}

fs/xfs/libxfs/xfs_refcount.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Oracle.  All Rights Reserved.

 *

 * Author: Darrick J. Wong <darrick.wong@oracle.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.

 */

#ifndef __XFS_REFCOUNT_H__

#define __XFS_REFCOUNT_H__



extern int xfs_refcount_lookup_le(struct xfs_btree_cur *cur,

		xfs_agblock_t bno, int *stat);

extern int xfs_refcount_lookup_ge(struct xfs_btree_cur *cur,

		xfs_agblock_t bno, int *stat);

extern int xfs_refcount_get_rec(struct xfs_btree_cur *cur,

		struct xfs_refcount_irec *irec, int *stat);



#endif	/* __XFS_REFCOUNT_H__ */