[dm-devel] [PATCH 3.4, 3.5 and earlier] dm: fix truncated status strings

[Luis Henriques]

On Mon, Dec 09, 2013 at 04:17:01PM +0000, Luis Henriques wrote:
> On Fri, Dec 06, 2013 at 02:31:03PM -0500, Mikulas Patocka wrote:
> > Hi
> > 
> > I noticed that the upstream commit 
> > fd7c092e711ebab55b2688d3859d95dfd0301f73 wasn't added to 3.4 stable 
> > kernel, so here I am resending it. It can also, with small changes, be 
> > applied to 3.5, 3.2, 3.0 and other stable kernels.
> > 
> > Mikulas
> > 
> 
> Thank you Mikulas, I was going to queue this backport to the 3.5
> kernel when I noticed something that seems to be wrong:

Bah, please ignore me.  I was reviewing this patch against the 3.5
kernel, which definitely requires a slightly different backport (as
you suggested).

Cheers,
--
Luis


> 
> [ ... ]
> 
> >  static int stripe_end_io(struct dm_target *ti, struct bio *bio,
> > Index: linux-3.4.71/drivers/md/dm-thin.c
> > ===================================================================
> > --- linux-3.4.71.orig/drivers/md/dm-thin.c	2013-05-20 17:55:14.000000000 +0200
> > +++ linux-3.4.71/drivers/md/dm-thin.c	2013-11-30 01:01:51.000000000 +0100
> > @@ -2325,8 +2325,8 @@ static int pool_message(struct dm_target
> >   *    <transaction id> <used metadata sectors>/<total metadata sectors>
> >   *    <used data sectors>/<total data sectors> <held metadata root>
> >   */
> > -static int pool_status(struct dm_target *ti, status_type_t type,
> > -		       char *result, unsigned maxlen)
> > +static void pool_status(struct dm_target *ti, status_type_t type,
> > +			char *result, unsigned maxlen)
> >  {
> >  	int r, count;
> >  	unsigned sz = 0;
> > @@ -2343,32 +2343,41 @@ static int pool_status(struct dm_target
> >  
> >  	switch (type) {
> >  	case STATUSTYPE_INFO:
> > -		r = dm_pool_get_metadata_transaction_id(pool->pmd,
> > -							&transaction_id);
> > -		if (r)
> > -			return r;
> > -
> > -		r = dm_pool_get_free_metadata_block_count(pool->pmd,
> > -							  &nr_free_blocks_metadata);
> > -		if (r)
> > -			return r;
> > +		r = dm_pool_get_metadata_transaction_id(pool->pmd, &transaction_id);
> > +		if (r) {
> > +			DMERR("dm_pool_get_metadata_transaction_id returned %d", r);
> > +			goto err;
> > +		}
> > +
> > +		r = dm_pool_get_free_metadata_block_count(pool->pmd, &nr_free_blocks_metadata);
> > +		if (r) {
> > +			DMERR("dm_pool_get_free_metadata_block_count returned %d", r);
> > +			goto err;
> > +		}
> >  
> >  		r = dm_pool_get_metadata_dev_size(pool->pmd, &nr_blocks_metadata);
> > -		if (r)
> > -			return r;
> > +		if (r) {
> > +			DMERR("dm_pool_get_metadata_dev_size returned %d", r);
> > +			goto err;
> > +		}
> >  
> > -		r = dm_pool_get_free_block_count(pool->pmd,
> > -						 &nr_free_blocks_data);
> > -		if (r)
> > -			return r;
> > +		r = dm_pool_get_free_block_count(pool->pmd, &nr_free_blocks_data);
> > +		if (r) {
> > +			DMERR("dm_pool_get_free_block_count returned %d", r);
> > +			goto err;
> > +		}
> >  
> >  		r = dm_pool_get_data_dev_size(pool->pmd, &nr_blocks_data);
> > -		if (r)
> > -			return r;
> > +		if (r) {
> > +			DMERR("dm_pool_get_data_dev_size returned %d", r);
> > +			goto err;
> > +		}
> >  
> >  		r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
> 
> Looking at the original commit, the above line seems to be wrong.
> Shouldn't it be:
> 
> 		r = dm_pool_get_metadata_snap(pool->pmd, &held_root);
> 
> Cheers,
> --
> Luis
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html