[PATCH] Btrfs: fix subvolume mount by name problem when default mount subvolume is set

[PATCH] Btrfs: fix subvolume mount by name problem when default mount subvolume is set

[Zhong, Xin]

We create two subvolumes (meego_root and meego_home) in
btrfs root directory. And set meego_root as default mount
subvolume. After we remount btrfs, meego_root is mounted
to top directory by default. Then when we try to mount
meego_home (subvol=meego_home) to a subdirectory, it failed.
The problem is when default mount subvolume is set to
meego_root, we search meego_home in it but can not find it.
So the solution is to search meego_home in btrfs root
directory instead when subvol=meego_home is given.

Detail information can be found in meego bugzilla:
https://bugs.meego.com/show_bug.cgi?id=15055

Signed-off-by: Zhong, Xin <xin.zhong@intel.com>
---
 fs/btrfs/super.c |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index db0a827..138bc4c 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -786,15 +786,18 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		s->s_flags |= MS_ACTIVE;
 	}
 
-	root = get_default_root(s, subvol_objectid);
-	if (IS_ERR(root)) {
-		error = PTR_ERR(root);
-		deactivate_locked_super(s);
-		goto error_free_subvol_name;
-	}
 	/* if they gave us a subvolume name bind mount into that */
 	if (strcmp(subvol_name, ".")) {
 		struct dentry *new_root;
+		
+		/* we search subvolume name in the btrfs root, not the default mount subvolume */
+		root = get_default_root(s, BTRFS_FS_TREE_OBJECTID);
+		if (IS_ERR(root)) {
+			error = PTR_ERR(root);
+			deactivate_locked_super(s);
+			goto error_free_subvol_name;
+		}
+
 		mutex_lock(&root->d_inode->i_mutex);
 		new_root = lookup_one_len(subvol_name, root,
 				      strlen(subvol_name));
@@ -816,6 +819,14 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		dput(root);
 		root = new_root;
 	}
+	else {
+		root = get_default_root(s, subvol_objectid);
+		if (IS_ERR(root)) {
+			error = PTR_ERR(root);
+			deactivate_locked_super(s);
+			goto error_free_subvol_name;
+		}
+	}
 
 	mnt->mnt_sb = s;
 	mnt->mnt_root = root;
-- 
1.7.0.4

Re: [PATCH] Btrfs: fix subvolume mount by name problem when default mount subvolume is set

[Chris Mason]

Excerpts from Zhong, Xin's message of 2011-03-31 03:59:22 -0400:
> We create two subvolumes (meego_root and meego_home) in
> btrfs root directory. And set meego_root as default mount
> subvolume. After we remount btrfs, meego_root is mounted
> to top directory by default. Then when we try to mount
> meego_home (subvol=meego_home) to a subdirectory, it failed.
> The problem is when default mount subvolume is set to
> meego_root, we search meego_home in it but can not find it.
> So the solution is to search meego_home in btrfs root
> directory instead when subvol=meego_home is given.

I think this one is difficult because if they have set the default
subvolume they might have done so because the original default has the
result of a busted upgrade or something in it.

So, I think the subvol= should be relative to the default.  Would it
work for you to add a new mount option to specify the subvol id to
search for subvol=?

-chris

RE: [PATCH] Btrfs: fix subvolume mount by name problem when default mount subvolume is set

[Zhong, Xin]

PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBDaHJpcyBNYXNvbiBbbWFpbHRv
OmNocmlzLm1hc29uQG9yYWNsZS5jb21dDQo+IFNlbnQ6IFR1ZXNkYXksIEFwcmlsIDA1LCAyMDEx
IDE6MDcgUE0NCj4gVG86IFpob25nLCBYaW4NCj4gQ2M6IGxpbnV4LWJ0cmZzDQo+IFN1YmplY3Q6
IFJlOiBbUEFUQ0hdIEJ0cmZzOiBmaXggc3Vidm9sdW1lIG1vdW50IGJ5IG5hbWUgcHJvYmxlbSB3
aGVuDQo+IGRlZmF1bHQgbW91bnQgc3Vidm9sdW1lIGlzIHNldA0KPiANCj4gRXhjZXJwdHMgZnJv
bSBaaG9uZywgWGluJ3MgbWVzc2FnZSBvZiAyMDExLTAzLTMxIDAzOjU5OjIyIC0wNDAwOg0KPiA+
IFdlIGNyZWF0ZSB0d28gc3Vidm9sdW1lcyAobWVlZ29fcm9vdCBhbmQgbWVlZ29faG9tZSkgaW4N
Cj4gPiBidHJmcyByb290IGRpcmVjdG9yeS4gQW5kIHNldCBtZWVnb19yb290IGFzIGRlZmF1bHQg
bW91bnQNCj4gPiBzdWJ2b2x1bWUuIEFmdGVyIHdlIHJlbW91bnQgYnRyZnMsIG1lZWdvX3Jvb3Qg
aXMgbW91bnRlZA0KPiA+IHRvIHRvcCBkaXJlY3RvcnkgYnkgZGVmYXVsdC4gVGhlbiB3aGVuIHdl
IHRyeSB0byBtb3VudA0KPiA+IG1lZWdvX2hvbWUgKHN1YnZvbD1tZWVnb19ob21lKSB0byBhIHN1
YmRpcmVjdG9yeSwgaXQgZmFpbGVkLg0KPiA+IFRoZSBwcm9ibGVtIGlzIHdoZW4gZGVmYXVsdCBt
b3VudCBzdWJ2b2x1bWUgaXMgc2V0IHRvDQo+ID4gbWVlZ29fcm9vdCwgd2Ugc2VhcmNoIG1lZWdv
X2hvbWUgaW4gaXQgYnV0IGNhbiBub3QgZmluZCBpdC4NCj4gPiBTbyB0aGUgc29sdXRpb24gaXMg
dG8gc2VhcmNoIG1lZWdvX2hvbWUgaW4gYnRyZnMgcm9vdA0KPiA+IGRpcmVjdG9yeSBpbnN0ZWFk
IHdoZW4gc3Vidm9sPW1lZWdvX2hvbWUgaXMgZ2l2ZW4uDQo+IA0KPiBJIHRoaW5rIHRoaXMgb25l
IGlzIGRpZmZpY3VsdCBiZWNhdXNlIGlmIHRoZXkgaGF2ZSBzZXQgdGhlIGRlZmF1bHQNCj4gc3Vi
dm9sdW1lIHRoZXkgbWlnaHQgaGF2ZSBkb25lIHNvIGJlY2F1c2UgdGhlIG9yaWdpbmFsIGRlZmF1
bHQgaGFzIHRoZQ0KPiByZXN1bHQgb2YgYSBidXN0ZWQgdXBncmFkZSBvciBzb21ldGhpbmcgaW4g
aXQuDQo+IA0KPiBTbywgSSB0aGluayB0aGUgc3Vidm9sPSBzaG91bGQgYmUgcmVsYXRpdmUgdG8g
dGhlIGRlZmF1bHQuICBXb3VsZCBpdA0KPiB3b3JrIGZvciB5b3UgdG8gYWRkIGEgbmV3IG1vdW50
IG9wdGlvbiB0byBzcGVjaWZ5IHRoZSBzdWJ2b2wgaWQgdG8NCj4gc2VhcmNoIGZvciBzdWJ2b2w9
Pw0KPiANCg0KU291bmRzIGdvb2QuIEkgd2lsbCBzdWJtaXQgYSBuZXcgdmVyc2lvbi4gVGhhbmtz
IQ0KDQo+IC1jaHJpcw0K