lkml.org 
[lkml]   [2009]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[v3][PATCH 4/5] Remove get_init_pts_sb()

    From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Subject: [v3][PATCH 4/5] Remove get_init_pts_sb()

    With mknod_ptmx() moved to devpts_get_sb(), init_pts_mount() becomes
    a wrapper around get_init_pts_sb(). Remove get_init_pts_sb() and
    fold code into init_pts_mount().

    Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    ---
    fs/devpts/inode.c | 25 ++++++-------------------
    1 files changed, 6 insertions(+), 19 deletions(-)

    diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
    index f7e887c..c821c9a 100644
    --- a/fs/devpts/inode.c
    +++ b/fs/devpts/inode.c
    @@ -347,7 +347,11 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags,
    }

    /*
    - * get_init_pts_sb()
    + * init_pts_mount()
    + *
    + * Mount or remount the initial kernel mount of devpts. This type of
    + * mount maintains the legacy, single-instance semantics, while the
    + * kernel still allows multiple-instances.
    *
    * This interface is needed to support multiple namespace semantics in
    * devpts while preserving backward compatibility of the current 'single-
    @@ -367,7 +371,7 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags,
    * consistently selects the 'single-namespace' superblock even in the
    * presence of the private namespace (i.e 'newinstance') super-blocks.
    */
    -static int get_init_pts_sb(struct file_system_type *fs_type, int flags,
    +static int init_pts_mount(struct file_system_type *fs_type, int flags,
    void *data, struct pts_mount_opts *opts, struct vfsmount *mnt)
    {
    struct super_block *s;
    @@ -397,23 +401,6 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags,
    return 0;
    }

    -/*
    - * Mount or remount the initial kernel mount of devpts. This type of
    - * mount maintains the legacy, single-instance semantics, while the
    - * kernel still allows multiple-instances.
    - */
    -static int init_pts_mount(struct file_system_type *fs_type, int flags,
    - void *data, struct pts_mount_opts *opts, struct vfsmount *mnt)
    -{
    - int err;
    -
    - err = get_init_pts_sb(fs_type, flags, data, opts, mnt);
    - if (err)
    - return err;
    -
    - return err;
    -}
    -
    static int devpts_get_sb(struct file_system_type *fs_type,
    int flags, const char *dev_name, void *data, struct vfsmount *mnt)
    {
    --
    1.5.2.5


    \
     
     \ /
      Last update: 2009-03-07 19:17    [W:0.024 / U:31.568 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site