Commit eb253f83 authored by Xiubo Li's avatar Xiubo Li Committed by Greg Kroah-Hartman
Browse files

ceph: move mount state enum to super.h 



[ Upstream commit b38b17b6 ]

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

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarVenky Shankar <vshankar@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b9f21e40

fs/ceph/super.h

+10 −0
Original line number Diff line number Diff line
@@ -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 {

include/linux/ceph/libceph.h

+0 −10
Original line number Diff line number Diff line
@@ -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;