Re: [v2][PATCH 5/5] Merge code for single and multiple-instancemounts

[Serge E. Hallyn]

Quoting Sukadev Bhattiprolu (sukadev@xxxxxxxxxxxxxxxxxx):
> 
> From: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx>
> Date: Wed, 28 Jan 2009 19:11:15 -0800
> Subject: [v2][PATCH 5/5] Merge code for single and multiple-instance mounts
> 
> new_pts_mount() (including the get_sb_nodev()), shares a lot of code
> with init_pts_mount(). The only difference between them is the 'test-super'
> function passed into sget().
> 
> Move all common code into devpts_get_sb() and remove the new_pts_mount() and
> init_pts_mount() functions,
> 
> Changelog[v2]:
> 	(Christoph Hellwig): Merge code in 'do_pts_mount()' into devpts_get_sb()
> 
> Signed-off-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx>

Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Tested-by: Serge Hallyn <serue@xxxxxxxxxx>

except that:

> @@ -414,24 +365,41 @@ static int devpts_get_sb(struct file_system_type *fs_type,
>  			return error;
>  	}
> 
> -	if (opts.newinstance)
> -		error = new_pts_mount(fs_type, flags, data, &opts, mnt);
> -	else
> -		error = init_pts_mount(fs_type, flags, data, &opts, mnt);
> +	if (opts.newinstance) {
> +		printk(KERN_NOTICE "devpts: newinstance mount\n");
> +		s = sget(fs_type, NULL, set_anon_super, NULL);
> +	} else {
> +		printk(KERN_NOTICE "devpts: single-instance mount\n");

These printks probably shouldn't stay in...

> +		s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL);
> +	}

thanks,
-serge
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/