[kernel] r15313 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Thu Mar  4 01:10:07 2010
New Revision: 15313

Log:
linux-base: Remove unnecessary blocks from assign_labels()

Modified:
   dists/trunk/linux-2.6/debian/linux-base.postinst

Modified: dists/trunk/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.postinst	Wed Mar  3 21:55:31 2010	(r15312)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst	Thu Mar  4 01:10:07 2010	(r15313)
@@ -1285,58 +1285,53 @@
     # For all devices that have no alternate device ids, suggest labelling
     # them based on fstab or just using a generic label.
     for my $bdev (keys(%bdev_map)) {
-	if ($#{$bdev_map{$bdev}->{ids}} >= 0) {
-	    my $id = $bdev_map{$bdev}->{ids}->[0];
-	} else {
-	    my $type = $bdev_map{$bdev}->{type};
-	    
-	    if (!exists($label_types{$type})) {
-		next;
-	    }
+	next if $#{$bdev_map{$bdev}->{ids}} >= 0;
 
-	    my $label_len = $label_types{$type}->{len};
-	    my $label;
-	    use bytes; # string lengths are in bytes
-
-	    if (defined($bdev_map{$bdev}->{path})) {
-		# Convert path/type to label; prepend hostname if possible;
-		# append numeric suffix if necessary.
-
-		my $base;
-		if ($bdev_map{$bdev}->{path} =~ m|^/|) {
-		    $base = $bdev_map{$bdev}->{path};
-		} else {
-		    $base = $bdev_map{$bdev}->{type};
-		}
-		$base =~ s/[^\w]+/-/g;
-		$base =~ s/^-//g;
-		$base =~ s/-$//g;
-
-		my $n = 0;
-		my $suffix = '';
-		do {
-		    $label = "$hostname-$base$suffix";
-		    if (length($label) > $label_len) {
-			$label = substr($base, 0, $label_len - length($suffix))
-			    . $suffix;
-		    }
-		    $n++;
-		    $suffix = "-$n";
-		} while (exists($id_map{"LABEL=$label"}));
+	my $type = $bdev_map{$bdev}->{type};
+	next unless exists($label_types{$type});
+
+	my $label_len = $label_types{$type}->{len};
+	my $label;
+	use bytes; # string lengths are in bytes
+
+	if (defined($bdev_map{$bdev}->{path})) {
+	    # Convert path/type to label; prepend hostname if possible;
+	    # append numeric suffix if necessary.
+
+	    my $base;
+	    if ($bdev_map{$bdev}->{path} =~ m|^/|) {
+		$base = $bdev_map{$bdev}->{path};
 	    } else {
-		my $n = 0;
-		my $suffix;
-		do {
-		    $n++;
-		    $suffix = "-$n";
-		    $label = substr($hostname, 0, $label_len - length($suffix))
-			. $suffix;
-		} while (exists($id_map{"LABEL=$label"}));
+		$base = $bdev_map{$bdev}->{type};
 	    }
-
-	    add_tag($bdev, 'LABEL', $label);
-	    $bdev_map{$bdev}->{relabel} = 1;
+	    $base =~ s/[^\w]+/-/g;
+	    $base =~ s/^-//g;
+	    $base =~ s/-$//g;
+
+	    my $n = 0;
+	    my $suffix = '';
+	    do {
+		$label = "$hostname-$base$suffix";
+		if (length($label) > $label_len) {
+		    $label = substr($base, 0, $label_len - length($suffix))
+			. $suffix;
+		}
+		$n++;
+		$suffix = "-$n";
+	    } while (exists($id_map{"LABEL=$label"}));
+	} else {
+	    my $n = 0;
+	    my $suffix;
+	    do {
+		$n++;
+		$suffix = "-$n";
+		$label = substr($hostname, 0, $label_len - length($suffix))
+		    . $suffix;
+	    } while (exists($id_map{"LABEL=$label"}));
 	}
+
+	add_tag($bdev, 'LABEL', $label);
+	$bdev_map{$bdev}->{relabel} = 1;
     }
 }