[PATCH] hotplug: allow hardlinked files for block device images

[PATCH] hotplug: allow hardlinked files for block device images

[Olaf Hering]

tools/hotplug/Linux/block change for this losetup -a output:
(inode 12 is listed twice due to hardlinks)

/dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
/dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
/dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
/dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
/dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
/dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
/dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)

Without this change, $dev would contain /dev/loop8\n/dev/loop10
Applies to 4.0 and 4.1

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 tools/hotplug/Linux/block |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- xen-4.0.1-testing.orig/tools/hotplug/Linux/block
+++ xen-4.0.1-testing/tools/hotplug/Linux/block
@@ -279,8 +279,8 @@ mount it read-write in a guest domain."
             fatal "Unable to lookup $file: dev: $dev inode: $inode"
           fi
 
-          shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} |
-                cut -d : -f 1)
+          shared_list=$(losetup -a |
+                sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" )
           for dev in "$shared_list"
           do
             if [ -n "$dev" ]

Re: [PATCH] hotplug: allow hardlinked files for block device images

[Olaf Hering]

Ping?


On Fri, Nov 26, Olaf Hering wrote:

> tools/hotplug/Linux/block change for this losetup -a output:
> (inode 12 is listed twice due to hardlinks)
> 
> /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
> /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
> /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
> /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
> /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)
> 
> Without this change, $dev would contain /dev/loop8\n/dev/loop10
> Applies to 4.0 and 4.1
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  tools/hotplug/Linux/block |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- xen-4.0.1-testing.orig/tools/hotplug/Linux/block
> +++ xen-4.0.1-testing/tools/hotplug/Linux/block
> @@ -279,8 +279,8 @@ mount it read-write in a guest domain."
>              fatal "Unable to lookup $file: dev: $dev inode: $inode"
>            fi
>  
> -          shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} |
> -                cut -d : -f 1)
> +          shared_list=$(losetup -a |
> +                sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" )
>            for dev in "$shared_list"
>            do
>              if [ -n "$dev" ]

Re: Re: [PATCH] hotplug: allow hardlinked files for block device images

[Keir Fraser]

Needs an Ack, or to be applied, by a tools maintainer.

 -- Keir

On 16/01/2011 14:43, "Olaf Hering" <olaf@aepfle.de> wrote:

> 
> Ping?
> 
> 
> On Fri, Nov 26, Olaf Hering wrote:
> 
>> tools/hotplug/Linux/block change for this losetup -a output:
>> (inode 12 is listed twice due to hardlinks)
>> 
>> /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
>> /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
>> /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
>> /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
>> /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
>> /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
>> /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)
>> 
>> Without this change, $dev would contain /dev/loop8\n/dev/loop10
>> Applies to 4.0 and 4.1
>> 
>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>> 
>> ---
>>  tools/hotplug/Linux/block |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> --- xen-4.0.1-testing.orig/tools/hotplug/Linux/block
>> +++ xen-4.0.1-testing/tools/hotplug/Linux/block
>> @@ -279,8 +279,8 @@ mount it read-write in a guest domain."
>>              fatal "Unable to lookup $file: dev: $dev inode: $inode"
>>            fi
>>  
>> -          shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} |
>> -                cut -d : -f 1)
>> +          shared_list=$(losetup -a |
>> +                sed -n -e
>> "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" )
>>            for dev in "$shared_list"
>>            do
>>              if [ -n "$dev" ]
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

Re: [PATCH] hotplug: allow hardlinked files for block device images

[Stefano Stabellini]

On Fri, 26 Nov 2010, Olaf Hering wrote:
> tools/hotplug/Linux/block change for this losetup -a output:
> (inode 12 is listed twice due to hardlinks)
> 
> /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
> /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
> /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
> /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
> /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)
> 
> Without this change, $dev would contain /dev/loop8\n/dev/loop10
> Applies to 4.0 and 4.1
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 

Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Re: [PATCH] hotplug: allow hardlinked files for block device images

[Paolo Bonzini]

On 11/26/2010 02:55 PM, Olaf Hering wrote:
> tools/hotplug/Linux/block change for this losetup -a output:
> (inode 12 is listed twice due to hardlinks)
>
> /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1)
> /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0)
> /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1)
> /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso)
> /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso)
> /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0)
>
> Without this change, $dev would contain /dev/loop8\n/dev/loop10
> Applies to 4.0 and 4.1
>
> Signed-off-by: Olaf Hering<olaf@aepfle.de>
>
> ---
>   tools/hotplug/Linux/block |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- xen-4.0.1-testing.orig/tools/hotplug/Linux/block
> +++ xen-4.0.1-testing/tools/hotplug/Linux/block
> @@ -279,8 +279,8 @@ mount it read-write in a guest domain."
>               fatal "Unable to lookup $file: dev: $dev inode: $inode"
>             fi
>
> -          shared_list=$(losetup -a | grep ' \[0*'${dev}'\]:'${inode} |
> -                cut -d : -f 1)
> +          shared_list=$(losetup -a |
> +                sed -n -e "s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](${file})\)@\1@p" )

Isn't this incorrect in case ${file} contains a character that is a 
regex escape (e.g. a star or backslash)?

Paolo

Re: [PATCH] hotplug: allow hardlinked files for block device images

[Olaf Hering]

On Mon, Jan 17, Paolo Bonzini wrote:

> Isn't this incorrect in case ${file} contains a character that is a
> regex escape (e.g. a star or backslash)?

I'm sure there are pathnames which break the regex in some way.
Adding an escape for '@' could be added, for example.

How well can the rest of Xen cope with odd filenames? In other words,
does it even get there if the configured pathnames have odd chars in it?

Olaf

Re: [PATCH] hotplug: allow hardlinked files for block device images

[Paolo Bonzini]

On 01/17/2011 04:57 PM, Olaf Hering wrote:
> I'm sure there are pathnames which break the regex in some way.
> Adding an escape for '@' could be added, for example.
>
> How well can the rest of Xen cope with odd filenames? In other words,
> does it even get there if the configured pathnames have odd chars in it?

@ is definitely not so odd...

Paolo

Re: [PATCH] hotplug: allow hardlinked files for block device images [and 1 more messages]

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH] hotplug: allow hardlinked files for block device images"):
> Without this change, $dev would contain /dev/loop8\n/dev/loop10
> Applies to 4.0 and 4.1

Thanks.  I have applied this to xen-unstable.hg.  I'm always a bit suspicious
of hotplug script changes, so we'll wait with backporting it to see if
it doesn't cause immediate trouble ...

Paolo Bonzini writes ("[Xen-devel] Re: [PATCH] hotplug: allow hardlinked files for block device images"):
> On 01/17/2011 04:57 PM, Olaf Hering wrote:
> > I'm sure there are pathnames which break the regex in some way.
> > Adding an escape for '@' could be added, for example.
> >
> > How well can the rest of Xen cope with odd filenames? In other words,
> > does it even get there if the configured pathnames have odd chars in it?
> 
> @ is definitely not so odd...

Yes, this is a good point.  However, I think the patch as it stands is
an improvement.  Feel free to submit changes to make it more robust
:-).

Thanks,
Ian.