lkml.org 
[lkml]   [2023]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.1 37/38] ceph: move mount state enum to super.h
    Date
    From: Xiubo Li <xiubli@redhat.com>

    [ Upstream commit b38b17b6a01ca4e738af097a1529910646ef4270 ]

    These flags are only used in ceph filesystem in fs/ceph, so just
    move it to the place it should be.

    Signed-off-by: Xiubo Li <xiubli@redhat.com>
    Reviewed-by: Venky Shankar <vshankar@redhat.com>
    Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/ceph/super.h | 10 ++++++++++
    include/linux/ceph/libceph.h | 10 ----------
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/fs/ceph/super.h b/fs/ceph/super.h
    index ae4126f634101..735279b2ceb55 100644
    --- a/fs/ceph/super.h
    +++ b/fs/ceph/super.h
    @@ -100,6 +100,16 @@ struct ceph_mount_options {
    char *mon_addr;
    };

    +/* mount state */
    +enum {
    + CEPH_MOUNT_MOUNTING,
    + CEPH_MOUNT_MOUNTED,
    + CEPH_MOUNT_UNMOUNTING,
    + CEPH_MOUNT_UNMOUNTED,
    + CEPH_MOUNT_SHUTDOWN,
    + CEPH_MOUNT_RECOVER,
    +};
    +
    #define CEPH_ASYNC_CREATE_CONFLICT_BITS 8

    struct ceph_fs_client {
    diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
    index 00af2c98da75a..4497d0a6772cd 100644
    --- a/include/linux/ceph/libceph.h
    +++ b/include/linux/ceph/libceph.h
    @@ -99,16 +99,6 @@ struct ceph_options {

    #define CEPH_AUTH_NAME_DEFAULT "guest"

    -/* mount state */
    -enum {
    - CEPH_MOUNT_MOUNTING,
    - CEPH_MOUNT_MOUNTED,
    - CEPH_MOUNT_UNMOUNTING,
    - CEPH_MOUNT_UNMOUNTED,
    - CEPH_MOUNT_SHUTDOWN,
    - CEPH_MOUNT_RECOVER,
    -};
    -
    static inline unsigned long ceph_timeout_jiffies(unsigned long timeout)
    {
    return timeout ?: MAX_SCHEDULE_TIMEOUT;
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-27 00:16    [W:3.975 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site