[WIP] [PATCH 12/12] erofs-utils: fuse: fix up source headers

Gao Xiang hsiangkao at aol.com
Sat Oct 17 16:16:21 AEDT 2020 

fix up weird paths and relicense zmap.c

[ let's fold in to the original patch. ]
Signed-off-by: Gao Xiang <hsiangkao at aol.com>
---
 fuse/decompress.c | 5 +++--
 fuse/decompress.h | 3 ++-
 fuse/dentry.c     | 4 ++--
 fuse/dentry.h     | 4 ++--
 fuse/disk_io.c    | 4 ++--
 fuse/disk_io.h    | 4 ++--
 fuse/getattr.c    | 4 ++--
 fuse/getattr.h    | 4 ++--
 fuse/init.c       | 4 ++--
 fuse/init.h       | 4 ++--
 fuse/logging.c    | 4 ++--
 fuse/logging.h    | 4 ++--
 fuse/main.c       | 4 ++--
 fuse/namei.c      | 4 ++--
 fuse/namei.h      | 4 ++--
 fuse/open.c       | 4 ++--
 fuse/open.h       | 4 ++--
 fuse/read.c       | 5 +++--
 fuse/read.h       | 4 ++--
 fuse/readir.c     | 4 ++--
 fuse/readir.h     | 4 ++--
 fuse/zmap.c       | 7 ++++---
 22 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/fuse/decompress.c b/fuse/decompress.c
index fc12852ac6b7..f2aa84146946 100644
--- a/fuse/decompress.c
+++ b/fuse/decompress.c
@@ -1,9 +1,10 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+// SPDX-License-Identifier: GPL-2.0+
 /*
+ * erofs-utils/fuse/decompress.c
+ *
  * Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
  * Created by Huang Jianan <huangjianan at oppo.com>
  */
-
 #include <stdlib.h>
 #include <lz4.h>
 
diff --git a/fuse/decompress.h b/fuse/decompress.h
index 7d436f18da86..508aabab1664 100644
--- a/fuse/decompress.h
+++ b/fuse/decompress.h
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+ * erofs-utils/fuse/decompress.h
+ *
  * Copyright (C), 2008-2020, OPPO Mobile Comm Corp., Ltd.
  * Created by Huang Jianan <huangjianan at oppo.com>
  */
-
 #ifndef __EROFS_DECOMPRESS_H
 #define __EROFS_DECOMPRESS_H
 
diff --git a/fuse/dentry.c b/fuse/dentry.c
index 27192ecfd32e..1ae37e3abc86 100644
--- a/fuse/dentry.c
+++ b/fuse/dentry.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\dentry.c
+ * erofs-utils/fuse/dentry.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "dentry.h"
 #include "erofs/internal.h"
 #include "logging.h"
diff --git a/fuse/dentry.h b/fuse/dentry.h
index f89c50646fb5..12f4cf6bafd9 100644
--- a/fuse/dentry.h
+++ b/fuse/dentry.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\dentry.h
+ * erofs-utils/fuse/dentry.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef _EROFS_DENTRY_H
 #define _EROFS_DENTRY_H
 
diff --git a/fuse/disk_io.c b/fuse/disk_io.c
index 72d351b17806..3fc087699dc9 100644
--- a/fuse/disk_io.c
+++ b/fuse/disk_io.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\disk_io.c
+ * erofs-utils/fuse/disk_io.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #define _XOPEN_SOURCE 500
 #include "disk_io.h"
 
diff --git a/fuse/disk_io.h b/fuse/disk_io.h
index 6b4bd3cce085..d2c3dd598bc0 100644
--- a/fuse/disk_io.h
+++ b/fuse/disk_io.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\disk_io.h
+ * erofs-utils/fuse/disk_io.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __DISK_IO_H
 #define __DISK_IO_H
 
diff --git a/fuse/getattr.c b/fuse/getattr.c
index d2134f486e19..e5200ebeef1a 100644
--- a/fuse/getattr.c
+++ b/fuse/getattr.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\getattr.c
+ * erofs-utils/fuse/getattr.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "getattr.h"
 
 #include <sys/types.h>
diff --git a/fuse/getattr.h b/fuse/getattr.h
index dbcff7c1a6e1..735529a91d5b 100644
--- a/fuse/getattr.h
+++ b/fuse/getattr.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\getattr.h
+ * erofs-utils/fuse/getattr.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __EROFS_GETATTR_H
 #define __EROFS_GETATTR_H
 
diff --git a/fuse/init.c b/fuse/init.c
index e9cc9f81d4c7..48125c5791fa 100644
--- a/fuse/init.c
+++ b/fuse/init.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\init.c
+ * erofs-utils/fuse/init.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "init.h"
 #include <string.h>
 #include <asm-generic/errno-base.h>
diff --git a/fuse/init.h b/fuse/init.h
index 3fc4eb548dda..405a92913b4a 100644
--- a/fuse/init.h
+++ b/fuse/init.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\init.h
+ * erofs-utils/fuse/init.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __EROFS_INIT_H
 #define __EROFS_INIT_H
 
diff --git a/fuse/logging.c b/fuse/logging.c
index 2d1f1c77c2a4..192f546b94ec 100644
--- a/fuse/logging.c
+++ b/fuse/logging.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\logging.c
+ * erofs-utils/fuse/logging.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "logging.h"
 
 #include <stdio.h>
diff --git a/fuse/logging.h b/fuse/logging.h
index 7aa2eda405db..3aa77ab08107 100644
--- a/fuse/logging.h
+++ b/fuse/logging.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\logging.h
+ * erofs-utils/fuse/logging.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __LOGGING_H
 #define __LOGGING_H
 
diff --git a/fuse/main.c b/fuse/main.c
index 884101374bcf..9c8169725fa7 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\main.c
+ * erofs-utils/fuse/main.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/fuse/namei.c b/fuse/namei.c
index 0b71072027ce..c33af4b04b45 100644
--- a/fuse/namei.c
+++ b/fuse/namei.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\namei.c
+ * erofs-utils/fuse/namei.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "namei.h"
 #include <linux/kdev_t.h>
 #include <sys/types.h>
diff --git a/fuse/namei.h b/fuse/namei.h
index 80e84d7220aa..1803a673daaf 100644
--- a/fuse/namei.h
+++ b/fuse/namei.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\inode.h
+ * erofs-utils/fuse/inode.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __INODE_H
 #define __INODE_H
 
diff --git a/fuse/open.c b/fuse/open.c
index 9d2edca54d23..c219d3870000 100644
--- a/fuse/open.c
+++ b/fuse/open.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\open.c
+ * erofs-utils/fuse/open.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "open.h"
 #include <asm-generic/errno-base.h>
 #include <fuse.h>
diff --git a/fuse/open.h b/fuse/open.h
index d02c1f752204..dfc8b3cdd515 100644
--- a/fuse/open.h
+++ b/fuse/open.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\open.h
+ * erofs-utils/fuse/open.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __EROFS_OPEN_H
 #define __EROFS_OPEN_H
 
diff --git a/fuse/read.c b/fuse/read.c
index f3aa628945e3..621f7d6ce6ea 100644
--- a/fuse/read.c
+++ b/fuse/read.c
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\read.c
+ * erofs-utils/fuse/read.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
+ * Compression support by Huang Jianan <huangjianan at oppo.com>
  */
-
 #include "read.h"
 #include <errno.h>
 #include <linux/fs.h>
diff --git a/fuse/read.h b/fuse/read.h
index 89d4b4cd600c..e901c607dc91 100644
--- a/fuse/read.h
+++ b/fuse/read.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\read.h
+ * erofs-utils/fuse/read.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __EROFS_READ_H
 #define __EROFS_READ_H
 
diff --git a/fuse/readir.c b/fuse/readir.c
index 46ceb1d90a7f..f3dd0c42c6e2 100644
--- a/fuse/readir.c
+++ b/fuse/readir.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * erofs-fuse\readir.c
+ * erofs-utils/fuse/readir.c
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #include "readir.h"
 #include <errno.h>
 #include <linux/fs.h>
diff --git a/fuse/readir.h b/fuse/readir.h
index 21ab7a4e4e0b..ee2ab8bdd0f0 100644
--- a/fuse/readir.h
+++ b/fuse/readir.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * erofs-fuse\readir.h
+ * erofs-utils/fuse/readir.h
+ *
  * Created by Li Guifu <blucerlee at gmail.com>
  */
-
 #ifndef __EROFS_READDIR_H
 #define __EROFS_READDIR_H
 
diff --git a/fuse/zmap.c b/fuse/zmap.c
index 022ca1b9e437..8ec0a7707fd6 100644
--- a/fuse/zmap.c
+++ b/fuse/zmap.c
@@ -1,13 +1,14 @@
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Many parts of codes are copied from Linux kernel/fs/erofs.
+ * erofs-utils/fuse/zmap.c
+ *
+ * (a large amount of code was adapted from Linux kernel. )
  *
  * Copyright (C) 2018-2019 HUAWEI, Inc.
  *             https://www.huawei.com/
  * Created by Gao Xiang <gaoxiang25 at huawei.com>
  * Modified by Huang Jianan <huangjianan at oppo.com>
  */
-
 #include "init.h"
 #include "disk_io.h"
 #include "logging.h"
-- 
2.24.0

More information about the Linux-erofs mailing list