tmpfs on contemporary -current: panic: locked against myself

[Xin LI]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dag-Erling Smørgrav wrote:
> Kostik Belousov <kostikbel at gmail.com> writes:
>> The following patch fixed it for me.
>>
>> diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
>> index 4a3cdec..55e9891 100644
>> --- a/sys/fs/tmpfs/tmpfs_vfsops.c
>> +++ b/sys/fs/tmpfs/tmpfs_vfsops.c
>> @@ -201,7 +201,7 @@ tmpfs_mount(struct mount *mp, struct thread *td)
>>  	/* Root node attributes. */
>>  	uid_t	root_uid;
>>  	gid_t	root_gid;
>> -	mode_t	root_mode;
>> +	int	root_mode;
>>  
>>  	struct vattr	va;
>>  
> 
> Alternatively:
> 
> @@ -231,7 +231,7 @@
>             vfs_scanopt(mp->mnt_optnew, "uid", "%d", &root_uid) != 1)
>                 root_uid = va.va_uid;
>         if (mp->mnt_cred->cr_ruid != 0 ||
> -           vfs_scanopt(mp->mnt_optnew, "mode", "%o", &root_mode) != 1)
> +           vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1)
>                 root_mode = va.va_mode;
>         if(vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1)
>                 nodes_max = 0;

Oh...  My fault, thanks for pointing out.  I have just checked it into
- -HEAD.

> Incidentally, later edits to the tmpfs code have introduced a number of
> style(9) violations, one of which is visible in my patch.

Could you please give me a copy of the patch? :)

Cheers,
- --
Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQFHOKNdhcUczkLqiksRAhZ5AJ9MKCYlDT+NGGESAHf2BE0mSm5FeACgqHO3
Nk6Lk2Bt8L3z78oza08d9Xw=
=TfYA
-----END PGP SIGNATURE-----