diff mbox series

[16/22] coda: remove uapi/linux/coda_psdev.h

Message ID bb11378cef94739f2cf89425dd6d302a52c64480.1558117389.git.jaharkes@cs.cmu.edu (mailing list archive)
State New, archived
Headers show
Series Coda updates | expand

Commit Message

Jan Harkes May 17, 2019, 6:36 p.m. UTC 
Nothing is left in this header that is used by userspace.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
---
 fs/coda/coda_psdev.h            |  5 ++++-
 include/uapi/linux/coda_psdev.h | 10 ----------
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 include/uapi/linux/coda_psdev.h

Comments

Andrew Morton May 17, 2019, 11:29 p.m. UTC | #1 
On Fri, 17 May 2019 14:36:54 -0400 Jan Harkes <jaharkes@cs.cmu.edu> wrote:

> Nothing is left in this header that is used by userspace.
> 
>  fs/coda/coda_psdev.h            |  5 ++++-
>  include/uapi/linux/coda_psdev.h | 10 ----------

Confused.  There is no fs/coda/coda_psdev.h.  I did this.  It compiles
OK...


From: Jan Harkes <jaharkes@cs.cmu.edu>
Subject: coda: remove uapi/linux/coda_psdev.h

Nothing is left in this header that is used by userspace.

Link: http://lkml.kernel.org/r/bb11378cef94739f2cf89425dd6d302a52c64480.1558117389.git.jaharkes@cs.cmu.edu
Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/coda_psdev.h      |    5 ++++-
 include/uapi/linux/coda_psdev.h |   10 ----------
 2 files changed, 4 insertions(+), 11 deletions(-)

--- a/include/linux/coda_psdev.h~coda-remove-uapi-linux-coda_psdevh
+++ a/include/linux/coda_psdev.h
@@ -3,8 +3,11 @@
 #define __CODA_PSDEV_H
 
 #include <linux/backing-dev.h>
+#include <linux/magic.h>
 #include <linux/mutex.h>
-#include <uapi/linux/coda_psdev.h>
+
+#define CODA_PSDEV_MAJOR 67
+#define MAX_CODADEVS  5	   /* how many do we allow */
 
 struct kstatfs;
 
--- a/include/uapi/linux/coda_psdev.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__CODA_PSDEV_H
-#define _UAPI__CODA_PSDEV_H
-
-#include <linux/magic.h>
-
-#define CODA_PSDEV_MAJOR 67
-#define MAX_CODADEVS  5	   /* how many do we allow */
-
-#endif /* _UAPI__CODA_PSDEV_H */
Andrew Morton May 17, 2019, 11:49 p.m. UTC | #2 
On Fri, 17 May 2019 16:29:51 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:

> On Fri, 17 May 2019 14:36:54 -0400 Jan Harkes <jaharkes@cs.cmu.edu> wrote:
> 
> > Nothing is left in this header that is used by userspace.
> > 
> >  fs/coda/coda_psdev.h            |  5 ++++-
> >  include/uapi/linux/coda_psdev.h | 10 ----------
> 
> Confused.  There is no fs/coda/coda_psdev.h.  I did this.  It compiles
> OK...
> 

Is OK, I sorted it out.  I'm still recovering from an email server
glitch :(
Jan Harkes May 17, 2019, 11:51 p.m. UTC | #3 
patch #15 moves include/linux/coda_psdev.h to fs/coda/coda_psdev.h and patch #16 removes include/uapi/linux/coda_psdev.h.

Maybe #15 wasn't applied yet?

Jan


On May 17, 2019 7:29:51 PM EDT, Andrew Morton <akpm@linux-foundation.org> wrote:
>On Fri, 17 May 2019 14:36:54 -0400 Jan Harkes <jaharkes@cs.cmu.edu>
>wrote:
>
>> Nothing is left in this header that is used by userspace.
>> 
>>  fs/coda/coda_psdev.h            |  5 ++++-
>>  include/uapi/linux/coda_psdev.h | 10 ----------
>
>Confused.  There is no fs/coda/coda_psdev.h.  I did this.  It compiles
>OK...
>
>
>From: Jan Harkes <jaharkes@cs.cmu.edu>
>Subject: coda: remove uapi/linux/coda_psdev.h
>
>Nothing is left in this header that is used by userspace.
>
>Link:
>http://lkml.kernel.org/r/bb11378cef94739f2cf89425dd6d302a52c64480.1558117389.git.jaharkes@cs.cmu.edu
>Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>---
>
> include/linux/coda_psdev.h      |    5 ++++-
> include/uapi/linux/coda_psdev.h |   10 ----------
> 2 files changed, 4 insertions(+), 11 deletions(-)
>
>--- a/include/linux/coda_psdev.h~coda-remove-uapi-linux-coda_psdevh
>+++ a/include/linux/coda_psdev.h
>@@ -3,8 +3,11 @@
> #define __CODA_PSDEV_H
> 
> #include <linux/backing-dev.h>
>+#include <linux/magic.h>
> #include <linux/mutex.h>
>-#include <uapi/linux/coda_psdev.h>
>+
>+#define CODA_PSDEV_MAJOR 67
>+#define MAX_CODADEVS  5	   /* how many do we allow */
> 
> struct kstatfs;
> 
>--- a/include/uapi/linux/coda_psdev.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>-#ifndef _UAPI__CODA_PSDEV_H
>-#define _UAPI__CODA_PSDEV_H
>-
>-#include <linux/magic.h>
>-
>-#define CODA_PSDEV_MAJOR 67
>-#define MAX_CODADEVS  5	   /* how many do we allow */
>-
>-#endif /* _UAPI__CODA_PSDEV_H */
>_
diff mbox series

Patch

diff --git a/fs/coda/coda_psdev.h b/fs/coda/coda_psdev.h
index 012e16f741a6..801423cbbdfc 100644
--- a/fs/coda/coda_psdev.h
+++ b/fs/coda/coda_psdev.h
@@ -3,8 +3,11 @@ 
 #define __CODA_PSDEV_H
 
 #include <linux/backing-dev.h>
+#include <linux/magic.h>
 #include <linux/mutex.h>
-#include <linux/coda_psdev.h>
+
+#define CODA_PSDEV_MAJOR 67
+#define MAX_CODADEVS  5	   /* how many do we allow */
 
 struct kstatfs;
 
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
deleted file mode 100644
index 3dacb7fad66a..000000000000
--- a/include/uapi/linux/coda_psdev.h
+++ /dev/null
@@ -1,10 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__CODA_PSDEV_H
-#define _UAPI__CODA_PSDEV_H
-
-#include <linux/magic.h>
-
-#define CODA_PSDEV_MAJOR 67
-#define MAX_CODADEVS  5	   /* how many do we allow */
-
-#endif /* _UAPI__CODA_PSDEV_H */