Unable to mount multiple subvolumes of a single disk

Commit Message

Paul Sherwood Sept. 16, 2014, 7:46 a.m. UTC

Hi Anand
On 15/09/2014 18:42, Anand Jain wrote:
>>> The patch fixes the issue, although it took a little tweaking to get it
>>> to apply cleanly.

I'm working with Sam. This is what I applied, and it works:


> Sam,
> 
>   In the above context, Can you pls share the btrfs fi show output ?

btrfs fi show gives:

Label: 'src2'  uuid: c2fcd4f8-cc40-4fab-b13b-0d1268afb497
	Total devices 1 FS bytes used 77.93GB
	devid    1 size 100.00GB used 100.00GB path /dev/sdb

Label: 'baserock'  uuid: 129aff8f-65d9-4a19-9e2e-c3826bf5087d
	Total devices 1 FS bytes used 3.11GB
	devid    1 size 4.00GB used 4.00GB path /dev/sda

Btrfs v0.20-rc1-334-g304f215

br
Paul

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 340a92d..2c87b72 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -533,7 +533,7 @@  static noinline int device_list_add(const char *path,
                 * the btrfs dev scan cli, after FS has been mounted.
                 */
                if (fs_devices->opened) {
-                       return -EBUSY;
+                        goto out;
                } else {
                        /*
                         * That is if the FS is _not_ mounted and if you
@@ -570,6 +570,8 @@  static noinline int device_list_add(const char *path,
                fs_devices->latest_devid = devid;
                fs_devices->latest_trans = found_transid;
        }
+
+out:
        *fs_devices_ret = fs_devices;

        return ret;