Re: [PATCH 1/3] btrfs: iterate over unused chunk space in FITRIM

["Holger Hoffstätte" <holger.hoffstaette@googlemail.com>]

On Wed, 03 Jun 2015 10:47:52 -0400, jeffm wrote:

> This patch iterates over the unused chunk space and discards any regions
> that are unallocated, regardless of whether they were ever used.  This is
> a change for btrfs but is consistent with other file systems.
> ..
[snip]

This just gave me:

fs/btrfs/volumes.c: In function 'btrfs_shrink_device':
fs/btrfs/volumes.c:4148:31: warning: passing argument 1 of 'contains_pending_extent' from incompatible pointer type
   if (contains_pending_extent(trans, device, &start, len)) {
                               ^
fs/btrfs/volumes.c:1092:12: note: expected 'struct btrfs_transaction *' but argument is of type 'struct btrfs_trans_handle *'
 static int contains_pending_extent(struct btrfs_transaction *transaction,
            ^

because it changes the signature of contains_pending_extent():

> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 174f5e1..7fdde31 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -1051,15 +1051,18 @@ out:
>  	return ret;
>  }
>  
> -static int contains_pending_extent(struct btrfs_trans_handle *trans,
> +static int contains_pending_extent(struct btrfs_transaction *transaction,
>  				   struct btrfs_device *device,
>  				   u64 *start, u64 len)

which conflicts with Filipe's patch on Tuesday called "Btrfs: check pending chunks
when shrinking fs to avoid corruption":

+		if (contains_pending_extent(trans, device, &start, len)) {

since trans (returned from start_transaction()) is a handle, not the tx itself.

ISTM that it should now pass trans->transaction instead..or something.

-h