Re: [PATCH] Btrfs: remove BUG_ON()'s in btrfs_map_block

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Apr 14, 2016 at 10:16:36AM +0800, Anand Jain wrote:
> > -	BUG_ON(offset < stripe_offset);
> > +	if (offset < stripe_offset) {
> > +		btrfs_crit(fs_info, "stripe math has gone wrong, "
> > +			   "stripe_offset=%llu, offset=%llu, start=%llu, "
> 
> 
> > +			   "logical=%llu, stripe_len=%llu\n",
> 
>   btrfs_crit adds \n suffix by its own.

Right,

> 
> > +			   (unsigned long long)stripe_offset,
> > +			   (unsigned long long)offset,
> > +			   (unsigned long long)em->start,
> > +			   (unsigned long long)logical,
> > +			   (unsigned long long)stripe_len);

and we don't have to cast u64 to ULL anymore.

> > +		free_extent_map(em);
> > +		return -EINVAL;
> > +	}
> >
> >   	/* stripe_offset is the offset of this block in its stripe*/
> >   	stripe_offset = offset - stripe_offset;
> > @@ -5519,7 +5530,14 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
> >   				&stripe_index);
> >   		mirror_num = stripe_index + 1;
> >   	}
> > -	BUG_ON(stripe_index >= map->num_stripes);
> > +	if (stripe_index >= map->num_stripes) {
> > +		btrfs_crit(fs_info, "stripe index math went horribly wrong, "
> 
> > +			   "got stripe_index=%lu, num_stripes=%lu\n",
> 
>   -same-
> 
> Thanks, Anand
> 
> > +			   (unsigned long)stripe_index,
> > +			   (unsigned long)map->num_stripes);

typecasts dropped and format string updated.

Fixed and added to for-next.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux