The patch titled devpts: unroll essentials of do_remount_sb() into devpts has been added to the -mm tree. Its filename is devpts-unroll-essentials-of-do_remount_sb-into-devpts.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: devpts: unroll essentials of do_remount_sb() into devpts From: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx> On remount, devpts fs only needs to parse the mount options. Users cannot directly create/dirty files in /dev/pts so the MS_RDONLY flag and shrinking the dcache does not really apply to devpts. So effectively on remount, devpts only parses the mount options and updates these options in its super block. As such, we could replace do_remount_sb() call with a direct parse_mount_options(). Doing so enables subsequent patches to avoid parsing the mount options twice and simplify the code. Signed-off-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx> Acked-by: Serge Hallyn <serue@xxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/devpts/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN fs/devpts/inode.c~devpts-unroll-essentials-of-do_remount_sb-into-devpts fs/devpts/inode.c --- a/fs/devpts/inode.c~devpts-unroll-essentials-of-do_remount_sb-into-devpts +++ a/fs/devpts/inode.c @@ -437,6 +437,8 @@ static int get_init_pts_sb(struct file_s void *data, struct vfsmount *mnt) { struct super_block *s; + struct pts_mount_opts *opts; + struct pts_fs_info *fsi; int error; s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL); @@ -453,7 +455,10 @@ static int get_init_pts_sb(struct file_s } s->s_flags |= MS_ACTIVE; } - do_remount_sb(s, flags, data, 0); + fsi = DEVPTS_SB(s); + opts = &fsi->mount_opts; + parse_mount_options(data, PARSE_REMOUNT, opts); + simple_set_mnt(mnt, s); return 0; } _ Patches currently in -mm which might be from sukadev@xxxxxxxxxxxxxxxxxx are linux-next.patch vfs-simple_set_mnt-should-return-void.patch signals-remove-handler-parameter-to-tracehook-functions.patch signals-protect-init-from-unwanted-signals-more.patch signals-add-from_ancestor_ns-parameter-to-send_signal.patch signals-protect-cinit-from-unblocked-sig_dfl-signals.patch signals-zap_pid_ns_process-should-use-force_sig.patch signals-protect-cinit-from-blocked-fatal-signals.patch signals-si_user-masquerade-si_pid-when-crossing-pid-ns-boundary.patch pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu.patch pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu-fix.patch pids-improve-get_task_pid-to-fix-the-unsafe-sys_wait4-task_pgrp.patch pids-refactor-vnr-nr_ns-helpers-to-make-them-safe.patch pids-kill-now-unused-signal_struct-__pgrp-__session-and-friends.patch devpts-unroll-essentials-of-do_remount_sb-into-devpts.patch devpts-parse-mount-options-just-once-and-copy-them-to-super-block.patch devpts-move-common-mknod_ptmx-calls-into-caller.patch devpts-remove-get_init_pts_sb.patch devpts-merge-code-for-single-and-multiple-instance-mounts.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html