diff mbox series

[v4,4/6] ceph: move mdsmap.h to fs/ceph/

Message ID 20230619071438.7000-5-xiubli@redhat.com (mailing list archive)
State New, archived
Headers show
Series ceph: print the client global id for debug logs | expand

Commit Message

Xiubo Li June 19, 2023, 7:14 a.m. UTC 
From: Xiubo Li <xiubli@redhat.com>

The mdsmap.h is only used by the kcephfs and move it to fs/ceph/

URL: https://tracker.ceph.com/issues/61590
Cc: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 fs/ceph/mds_client.h                | 2 +-
 fs/ceph/mdsmap.c                    | 2 +-
 {include/linux => fs}/ceph/mdsmap.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {include/linux => fs}/ceph/mdsmap.h (100%)

Comments

Milind Changire Sept. 4, 2023, 9:29 a.m. UTC | #1 
Looks good to me.

Tested-by: Milind Changire <mchangir@redhat.com>
Tested-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

On Mon, Jun 19, 2023 at 12:47 PM <xiubli@redhat.com> wrote:
>
> From: Xiubo Li <xiubli@redhat.com>
>
> The mdsmap.h is only used by the kcephfs and move it to fs/ceph/
>
> URL: https://tracker.ceph.com/issues/61590
> Cc: Patrick Donnelly <pdonnell@redhat.com>
> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>  fs/ceph/mds_client.h                | 2 +-
>  fs/ceph/mdsmap.c                    | 2 +-
>  {include/linux => fs}/ceph/mdsmap.h | 0
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename {include/linux => fs}/ceph/mdsmap.h (100%)
>
> diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
> index 20bcf8d5322e..5d02c8c582fd 100644
> --- a/fs/ceph/mds_client.h
> +++ b/fs/ceph/mds_client.h
> @@ -14,9 +14,9 @@
>
>  #include <linux/ceph/types.h>
>  #include <linux/ceph/messenger.h>
> -#include <linux/ceph/mdsmap.h>
>  #include <linux/ceph/auth.h>
>
> +#include "mdsmap.h"
>  #include "metric.h"
>  #include "super.h"
>
> diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
> index 6cbec7aed5a0..d1bc81eecc18 100644
> --- a/fs/ceph/mdsmap.c
> +++ b/fs/ceph/mdsmap.c
> @@ -7,11 +7,11 @@
>  #include <linux/slab.h>
>  #include <linux/types.h>
>
> -#include <linux/ceph/mdsmap.h>
>  #include <linux/ceph/messenger.h>
>  #include <linux/ceph/decode.h>
>
>  #include "super.h"
> +#include "mdsmap.h"
>
>  #define CEPH_MDS_IS_READY(i, ignore_laggy) \
>         (m->m_info[i].state > 0 && ignore_laggy ? true : !m->m_info[i].laggy)
> diff --git a/include/linux/ceph/mdsmap.h b/fs/ceph/mdsmap.h
> similarity index 100%
> rename from include/linux/ceph/mdsmap.h
> rename to fs/ceph/mdsmap.h
> --
> 2.40.1
>
diff mbox series

Patch

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 20bcf8d5322e..5d02c8c582fd 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -14,9 +14,9 @@ 
 
 #include <linux/ceph/types.h>
 #include <linux/ceph/messenger.h>
-#include <linux/ceph/mdsmap.h>
 #include <linux/ceph/auth.h>
 
+#include "mdsmap.h"
 #include "metric.h"
 #include "super.h"
 
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
index 6cbec7aed5a0..d1bc81eecc18 100644
--- a/fs/ceph/mdsmap.c
+++ b/fs/ceph/mdsmap.c
@@ -7,11 +7,11 @@ 
 #include <linux/slab.h>
 #include <linux/types.h>
 
-#include <linux/ceph/mdsmap.h>
 #include <linux/ceph/messenger.h>
 #include <linux/ceph/decode.h>
 
 #include "super.h"
+#include "mdsmap.h"
 
 #define CEPH_MDS_IS_READY(i, ignore_laggy) \
 	(m->m_info[i].state > 0 && ignore_laggy ? true : !m->m_info[i].laggy)
diff --git a/include/linux/ceph/mdsmap.h b/fs/ceph/mdsmap.h
similarity index 100%
rename from include/linux/ceph/mdsmap.h
rename to fs/ceph/mdsmap.h