[PATCH 2/2 v3] xfs_repair: new secondary superblock search method

[Eric Sandeen]

On 2/11/16 6:19 PM, Eric Sandeen wrote:
> Hi Bill, looks like this is a diff on top of your prior patch,
> not a standalone patch.  It's modifying (not creating) libxcmd/topology.c,
> which doesn't exist upstream yet.

Sorry, I apologize - this was patch 2 of 2, and I didn't have patch 1
applied.  It's easier to spot dependencies when a series stays properly
threaded, though.  :)

And best to not fix issues with patch 1 in patch 2; just fix things
in the original patch which introduced it.

i.e. this:

--- a/libxcmd/topology.c
+++ b/libxcmd/topology.c
@@ -192,7 +192,8 @@ out:
 	return ret;
 }
 
-static void blkid_get_topology(
+static void
+blkid_get_topology(
 	const char	*device,
 	int		*sunit,
 	int		*swidth,
@@ -284,7 +285,8 @@ check_overwrite(
 	return 1;
 }

should all just be formatted as you want it in patch 1.

Thanks,
-Eric