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

Commit 3e57ecf6 authored by Olaf Weber's avatar Olaf Weber Committed by Nathan Scott
Browse files

[XFS] Add parameters to xfs_bmapi() and xfs_bunmapi() to have them report 


the range spanned by modifications to the in-core extent map.  Add
XFS_BUNMAPI() and XFS_SWAP_EXTENTS() macros that call xfs_bunmapi() and
xfs_swap_extents() via the ioops vector. Change all calls that may modify
the in-core extent map for the data fork to go through the ioops vector. 
This allows a cache of extent map data to be kept in sync.

SGI-PV: 947615
SGI-Modid: xfs-linux-melb:xfs-kern:209226a

Signed-off-by: default avatarOlaf Weber <olaf@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 128e6ced

fs/xfs/linux-2.6/xfs_lrw.c

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ xfs_zero_last_block( 
	last_fsb = XFS_B_TO_FSBT(mp, isize);

	nimaps = 1;

	error = XFS_BMAPI(mp, NULL, io, last_fsb, 1, 0, NULL, 0, &imap,

			  &nimaps, NULL);

			  &nimaps, NULL, NULL);

	if (error) {

		return error;

	}
@@ -556,7 +556,7 @@ xfs_zero_eof( 
		nimaps = 1;

		zero_count_fsb = end_zero_fsb - start_zero_fsb + 1;

		error = XFS_BMAPI(mp, NULL, io, start_zero_fsb, zero_count_fsb,

				  0, NULL, 0, &imap, &nimaps, NULL);

				  0, NULL, 0, &imap, &nimaps, NULL, NULL);

		if (error) {

			ASSERT(ismrlocked(io->io_lock, MR_UPDATE));

			ASSERT(ismrlocked(io->io_iolock, MR_UPDATE));

fs/xfs/linux-2.6/xfs_lrw.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct xfs_iomap; 
#define	XFS_CTRUNC4		14

#define	XFS_CTRUNC5		15

#define	XFS_CTRUNC6		16

#define	XFS_BUNMAPI		17

#define	XFS_BUNMAP		17

#define	XFS_INVAL_CACHED	18

#define	XFS_DIORD_ENTER		19

#define	XFS_DIOWR_ENTER		20

fs/xfs/quota/xfs_dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ xfs_qm_dqalloc( 
			      XFS_BMAPI_METADATA | XFS_BMAPI_WRITE,

			      &firstblock,

			      XFS_QM_DQALLOC_SPACE_RES(mp),

			      &map, &nmaps, &flist))) {

			      &map, &nmaps, &flist, NULL))) {

		goto error0;

	}

	ASSERT(map.br_blockcount == XFS_DQUOT_CLUSTER_SIZE_FSB);
@@ -559,7 +559,7 @@ xfs_qm_dqtobp( 
		error = xfs_bmapi(NULL, quotip, dqp->q_fileoffset,

				  XFS_DQUOT_CLUSTER_SIZE_FSB,

				  XFS_BMAPI_METADATA,

				  NULL, 0, &map, &nmaps, NULL);

				  NULL, 0, &map, &nmaps, NULL, NULL);



		xfs_iunlock(quotip, XFS_ILOCK_SHARED);

		if (error)

fs/xfs/quota/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ xfs_qm_dqiterate( 
				  maxlblkcnt - lblkno,

				  XFS_BMAPI_METADATA,

				  NULL,

				  0, map, &nmaps, NULL);

				  0, map, &nmaps, NULL, NULL);

		xfs_iunlock(qip, XFS_ILOCK_SHARED);

		if (error)

			break;

fs/xfs/xfs_attr.c

+7 −5
Original line number Diff line number Diff line
@@ -1910,7 +1910,7 @@ xfs_attr_rmtval_get(xfs_da_args_t *args) 
		error = xfs_bmapi(args->trans, args->dp, (xfs_fileoff_t)lblkno,

				  args->rmtblkcnt,

				  XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,

				  NULL, 0, map, &nmap, NULL);

				  NULL, 0, map, &nmap, NULL, NULL);

		if (error)

			return(error);

		ASSERT(nmap >= 1);
@@ -1988,7 +1988,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 
				  XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA |

							XFS_BMAPI_WRITE,

				  args->firstblock, args->total, &map, &nmap,

				  args->flist);

				  args->flist, NULL);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);
@@ -2039,7 +2039,8 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 
		error = xfs_bmapi(NULL, dp, (xfs_fileoff_t)lblkno,

				  args->rmtblkcnt,

				  XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,

				  args->firstblock, 0, &map, &nmap, NULL);

				  args->firstblock, 0, &map, &nmap,

				  NULL, NULL);

		if (error) {

			return(error);

		}
@@ -2104,7 +2105,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) 
					args->rmtblkcnt,

					XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,

					args->firstblock, 0, &map, &nmap,

					args->flist);

					args->flist, NULL);

		if (error) {

			return(error);

		}
@@ -2142,7 +2143,8 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) 
		XFS_BMAP_INIT(args->flist, args->firstblock);

		error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,

				    XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,

				    1, args->firstblock, args->flist, &done);

				    1, args->firstblock, args->flist,

				    NULL, &done);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);