Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move common mknod_ptmx() calls into caller

Browse source 
We create 'ptmx' node in both single-instance and multiple-instance
mounts. So devpts_get_sb() can call mknod_ptmx() once rather than
have both modes calling mknod_ptmx() separately.

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Sukadev Bhattiprolu 2009-03-07 10:11:41 -08:00 committed by Al Viro
parent 482984f06d
commit 945cf2c79f
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
fs/devpts/inode.c
View file

@ -338,17 +338,7 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags,
fsi = DEVPTS_SB(mnt->mnt_sb); fsi = DEVPTS_SB(mnt->mnt_sb);
memcpy(&fsi->mount_opts, opts, sizeof(opts)); memcpy(&fsi->mount_opts, opts, sizeof(opts));
err = mknod_ptmx(mnt->mnt_sb);
if (err)
goto fail;
return 0; return 0;
fail:
dput(mnt->mnt_sb->s_root);
up_write(&mnt->mnt_sb->s_umount);
deactivate_super(mnt->mnt_sb);
return err;
} }
/* /*
@ -416,13 +406,6 @@ static int init_pts_mount(struct file_system_type *fs_type, int flags,
if (err) if (err)
return err; return err;
err = mknod_ptmx(mnt->mnt_sb);
if (err) {
dput(mnt->mnt_sb->s_root);
up_write(&mnt->mnt_sb->s_umount);
deactivate_super(mnt->mnt_sb);
}
return err; return err;
} }
@ -440,9 +423,24 @@ static int devpts_get_sb(struct file_system_type *fs_type,
} }
if (opts.newinstance) if (opts.newinstance)
return new_pts_mount(fs_type, flags, data, &opts, mnt); error = new_pts_mount(fs_type, flags, data, &opts, mnt);
else else
return init_pts_mount(fs_type, flags, data, &opts, mnt); error = init_pts_mount(fs_type, flags, data, &opts, mnt);
if (error)
return error;
error = mknod_ptmx(mnt->mnt_sb);
if (error)
goto out_dput;
return 0;
out_dput:
dput(mnt->mnt_sb->s_root);
up_write(&mnt->mnt_sb->s_umount);
deactivate_super(mnt->mnt_sb);
return error;
} }
#else #else