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

Commit 1f4e0ff0 authored by Alasdair G Kergon's avatar Alasdair G Kergon
Browse files

dm thin: commit before gathering status 



Commit outstanding metadata before returning the status for a dm thin
pool so that the numbers reported are as up-to-date as possible.

The commit is not performed if the device is suspended or if
the DM_NOFLUSH_FLAG is supplied by userspace and passed to the target
through a new 'status_flags' parameter in the target's dm_status_fn.

The userspace dmsetup tool will support the --noflush flag with the
'dmsetup status' and 'dmsetup wait' commands from version 1.02.76
onwards.

Tested-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent e49e5829

drivers/md/dm-crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,7 @@ static int crypt_map(struct dm_target *ti, struct bio *bio, 
}



static int crypt_status(struct dm_target *ti, status_type_t type,

			char *result, unsigned int maxlen)

			unsigned status_flags, char *result, unsigned maxlen)

{

	struct crypt_config *cc = ti->private;

	unsigned int sz = 0;

drivers/md/dm-delay.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int delay_map(struct dm_target *ti, struct bio *bio, 
}



static int delay_status(struct dm_target *ti, status_type_t type,

			char *result, unsigned maxlen)

			unsigned status_flags, char *result, unsigned maxlen)

{

	struct delay_c *dc = ti->private;

	int sz = 0;

drivers/md/dm-flakey.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, 
}



static int flakey_status(struct dm_target *ti, status_type_t type,

			 char *result, unsigned int maxlen)

			 unsigned status_flags, char *result, unsigned maxlen)

{

	unsigned sz = 0;

	struct flakey_c *fc = ti->private;

drivers/md/dm-ioctl.c

+4 −1
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ static void retrieve_status(struct dm_table *table, 
	char *outbuf, *outptr;

	status_type_t type;

	size_t remaining, len, used = 0;

	unsigned status_flags = 0;



	outptr = outbuf = get_result_buffer(param, param_size, &len);
@@ -1090,7 +1091,9 @@ static void retrieve_status(struct dm_table *table, 


		/* Get the status/table string from the target driver */

		if (ti->type->status) {

			if (ti->type->status(ti, type, outptr, remaining)) {

			if (param->flags & DM_NOFLUSH_FLAG)

				status_flags |= DM_STATUS_NOFLUSH_FLAG;

			if (ti->type->status(ti, type, status_flags, outptr, remaining)) {

				param->flags |= DM_BUFFER_FULL_FLAG;

				break;

			}

drivers/md/dm-linear.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int linear_map(struct dm_target *ti, struct bio *bio, 
}



static int linear_status(struct dm_target *ti, status_type_t type,

			 char *result, unsigned int maxlen)

			 unsigned status_flags, char *result, unsigned maxlen)

{

	struct linear_c *lc = (struct linear_c *) ti->private;