Re: [PATCH 3/4] xfs_repair: collapse 2 cases in process_sf_dir2

[Brian Foster <bfoster@redhat.com>]

On Tue, Mar 10, 2015 at 05:04:15PM -0400, Eric Sandeen wrote:
> process_sf_dir2() has 2 cases for a bad namelen: on-disk namelen
> is 0, or on-disk namelen extends beyond the directory i_size.
> 
> After the prior 2 patches, the code for each case is now essentially
> the same, so collapse the two cases.
> 
> Note, this does slightly change some of the error messages.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
> 
> diff --git a/repair/dir2.c b/repair/dir2.c
> index 7aede6a..5512e41 100644
> --- a/repair/dir2.c
> +++ b/repair/dir2.c
> @@ -861,36 +861,44 @@ process_sf_dir2(
>  _("entry \"%*.*s\" in shortform directory %" PRIu64 " references %s inode %" PRIu64 "\n"),
>  				namelen, namelen, sfep->name, ino, junkreason,
>  				lino);
> -		if (namelen == 0)  {
> -			/*
> -			 * if we're really lucky, this is
> -			 * the last entry in which case we
> -			 * can use the dir size to set the
> -			 * namelen value.  otherwise, forget
> -			 * it because we're not going to be
> -			 * able to find the next entry.
> -			 */
> +
> +		/* is dir namelen 0 or does this entry extend past dir size? */
> +		if (namelen == 0) {
> +			junkreason = _("is zero length");
>  			bad_sfnamelen = 1;
> +		} else if ((__psint_t) sfep - (__psint_t) sfp +
> +				xfs_dir3_sf_entsize(mp, sfp, sfep->namelen)
> +							> ino_dir_size)  {
> +			junkreason = _("extends past end of dir");
> +			bad_sfnamelen = 1;
> +		}
>  
> +		if (bad_sfnamelen) {
> +			/*
> +			 * if we're really lucky, this is the last entry in

"... in which case ..."

(irrelevant as this is removed by the next patch)

Reviewed-by: Brian Foster <bfoster@redhat.com>

> +			 * case we can use the dir size to set the namelen
> +			 * value.  otherwise, forget it because we're not going
> +			 * to be able to find the next entry.
> +			 */
>  			if (i == num_entries - 1)  {
>  				namelen = ino_dir_size -
>  					((__psint_t) &sfep->name[0] -
>  					 (__psint_t) sfp);
>  				if (!no_modify)  {
>  					do_warn(
> -_("zero length entry in shortform dir %" PRIu64 ", resetting to %d\n"),
> -						ino, namelen);
> +_("entry #%d %s in shortform dir %" PRIu64 ", resetting to %d\n"),
> +						i, junkreason, ino, namelen);
>  					sfep->namelen = namelen;
>  					*dino_dirty = 1;
>  				} else  {
>  					do_warn(
> -_("zero length entry in shortform dir %" PRIu64 ", would set to %d\n"),
> -						ino, namelen);
> +_("entry #%d %s in shortform dir %" PRIu64 ", would set to %d\n"),
> +						i, junkreason, ino, namelen);
>  				}
>  			} else  {
>  				do_warn(
> -_("zero length entry in shortform dir %" PRIu64 ""),
> -					ino);
> +_("entry #%d %s in shortform dir %" PRIu64),
> +					i, junkreason, ino);
>  				if (!no_modify)
>  					do_warn(_(", junking %d entries\n"),
>  						num_entries - i);
> @@ -903,39 +911,6 @@ _("zero length entry in shortform dir %" PRIu64 ""),
>  				 */
>  				break;
>  			}
> -		} else if ((__psint_t) sfep - (__psint_t) sfp +
> -				xfs_dir3_sf_entsize(mp, sfp, sfep->namelen)
> -							> ino_dir_size)  {
> -			bad_sfnamelen = 1;
> -
> -			if (i == num_entries - 1)  {
> -				namelen = ino_dir_size -
> -					((__psint_t) &sfep->name[0] -
> -					 (__psint_t) sfp);
> -				do_warn(
> -_("size of last entry overflows space left in in shortform dir %" PRIu64 ", "),
> -					ino);
> -				if (!no_modify)  {
> -					do_warn(_("resetting to %d\n"),
> -						namelen);
> -					sfep->namelen = namelen;
> -					*dino_dirty = 1;
> -				} else  {
> -					do_warn(_("would reset to %d\n"),
> -						namelen);
> -				}
> -			} else  {
> -				do_warn(
> -_("size of entry #%d overflows space left in in shortform dir %" PRIu64 "\n"),
> -					i, ino);
> -				if (!no_modify)
> -					do_warn(_("junking %d entries\n"),
> -						num_entries - i);
> -				else
> -					do_warn(_("would junk %d entries\n"),
> -						num_entries - i);
> -				break;
> -			}
>  		}
>  
>  		/*
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs