From 575e946125f70c41c2042f10172842c5cab9a09a Mon Sep 17 00:00:00 2001
From: Mike Marshall <hubcap@omnibond.com>
Date: Fri, 4 Dec 2015 12:56:14 -0500
Subject: [PATCH] Orangefs: change pvfs2 filenames to orangefs

Also changed references within source files that referred to
header files whose names had changed.

Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---
 Makefile                                                | 2 +-
 fs/orangefs/Makefile                                    | 8 ++++----
 fs/orangefs/acl.c                                       | 4 ++--
 fs/orangefs/dcache.c                                    | 2 +-
 fs/orangefs/{devpvfs2-req.c => devorangefs-req.c}       | 6 +++---
 fs/orangefs/dir.c                                       | 4 ++--
 fs/orangefs/file.c                                      | 6 +++---
 fs/orangefs/inode.c                                     | 8 ++++----
 fs/orangefs/namei.c                                     | 2 +-
 fs/orangefs/{pvfs2-bufmap.c => orangefs-bufmap.c}       | 4 ++--
 fs/orangefs/{pvfs2-bufmap.h => orangefs-bufmap.h}       | 0
 fs/orangefs/{pvfs2-cache.c => orangefs-cache.c}         | 2 +-
 fs/orangefs/{pvfs2-debug.h => orangefs-debug.h}         | 0
 fs/orangefs/{pvfs2-debugfs.c => orangefs-debugfs.c}     | 4 ++--
 fs/orangefs/{pvfs2-debugfs.h => orangefs-debugfs.h}     | 0
 fs/orangefs/{pvfs2-dev-proto.h => orangefs-dev-proto.h} | 0
 fs/orangefs/{pvfs2-kernel.h => orangefs-kernel.h}       | 2 +-
 fs/orangefs/{pvfs2-mod.c => orangefs-mod.c}             | 8 ++++----
 fs/orangefs/{pvfs2-sysfs.c => orangefs-sysfs.c}         | 4 ++--
 fs/orangefs/{pvfs2-sysfs.h => orangefs-sysfs.h}         | 0
 fs/orangefs/{pvfs2-utils.c => orangefs-utils.c}         | 6 +++---
 fs/orangefs/protocol.h                                  | 6 +++---
 fs/orangefs/super.c                                     | 4 ++--
 fs/orangefs/symlink.c                                   | 4 ++--
 fs/orangefs/waitqueue.c                                 | 4 ++--
 fs/orangefs/xattr.c                                     | 4 ++--
 26 files changed, 47 insertions(+), 47 deletions(-)
 rename fs/orangefs/{devpvfs2-req.c => devorangefs-req.c} (99%)
 rename fs/orangefs/{pvfs2-bufmap.c => orangefs-bufmap.c} (99%)
 rename fs/orangefs/{pvfs2-bufmap.h => orangefs-bufmap.h} (100%)
 rename fs/orangefs/{pvfs2-cache.c => orangefs-cache.c} (99%)
 rename fs/orangefs/{pvfs2-debug.h => orangefs-debug.h} (100%)
 rename fs/orangefs/{pvfs2-debugfs.c => orangefs-debugfs.c} (99%)
 rename fs/orangefs/{pvfs2-debugfs.h => orangefs-debugfs.h} (100%)
 rename fs/orangefs/{pvfs2-dev-proto.h => orangefs-dev-proto.h} (100%)
 rename fs/orangefs/{pvfs2-kernel.h => orangefs-kernel.h} (99%)
 rename fs/orangefs/{pvfs2-mod.c => orangefs-mod.c} (98%)
 rename fs/orangefs/{pvfs2-sysfs.c => orangefs-sysfs.c} (99%)
 rename fs/orangefs/{pvfs2-sysfs.h => orangefs-sysfs.h} (100%)
 rename fs/orangefs/{pvfs2-utils.c => orangefs-utils.c} (99%)

diff --git a/Makefile b/Makefile
index 3a0234f50f36..aca4a73ad069 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc1-o
 NAME = Blurry Fish Butt
 
 # *DOCUMENTATION*
diff --git a/fs/orangefs/Makefile b/fs/orangefs/Makefile
index 828b36a6916d..a9d6a968fe6d 100644
--- a/fs/orangefs/Makefile
+++ b/fs/orangefs/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_ORANGEFS_FS) += orangefs.o
 
-orangefs-objs := acl.o file.o pvfs2-cache.o pvfs2-utils.o xattr.o dcache.o \
-		 inode.o pvfs2-sysfs.o pvfs2-mod.o super.o devpvfs2-req.o \
-		 namei.o symlink.o dir.o pvfs2-bufmap.o \
-		 pvfs2-debugfs.o waitqueue.o
+orangefs-objs := acl.o file.o orangefs-cache.o orangefs-utils.o xattr.o \
+		 dcache.o inode.o orangefs-sysfs.o orangefs-mod.o super.o \
+		 devorangefs-req.o namei.o symlink.o dir.o orangefs-bufmap.o \
+		 orangefs-debugfs.o waitqueue.o
diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c
index 5e27d5fcb6bf..03f89dbb2512 100644
--- a/fs/orangefs/acl.c
+++ b/fs/orangefs/acl.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/posix_acl_xattr.h>
 #include <linux/fs_struct.h>
 
diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c
index 12c916fa4c7f..5dd9841df64e 100644
--- a/fs/orangefs/dcache.c
+++ b/fs/orangefs/dcache.c
@@ -9,7 +9,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /* Returns 1 if dentry can still be trusted, else 0. */
 static int orangefs_revalidate_lookup(struct dentry *dentry)
diff --git a/fs/orangefs/devpvfs2-req.c b/fs/orangefs/devorangefs-req.c
similarity index 99%
rename from fs/orangefs/devpvfs2-req.c
rename to fs/orangefs/devorangefs-req.c
index e18149f0975b..e74938d575d6 100644
--- a/fs/orangefs/devpvfs2-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -8,9 +8,9 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-dev-proto.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-dev-proto.h"
+#include "orangefs-bufmap.h"
 
 #include <linux/debugfs.h>
 #include <linux/slab.h>
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 452d589b9747..c043894fc2bd 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 struct readdir_handle_s {
 	int buffer_index;
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index ae5d8ed67ed5..171013ae0036 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 
@@ -186,7 +186,7 @@ populate_shared_memory:
 	}
 
 	if (ret < 0) {
-		handle_io_error(); /* defined in pvfs2-kernel.h */
+		handle_io_error();
 		/*
 		 * don't write an error to syslog on signaled operation
 		 * termination unless we've got debugging turned on, as
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 58e83182d3dc..4724c92b61ac 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 static int read_one_page(struct page *page)
 {
@@ -125,7 +125,7 @@ static int orangefs_releasepage(struct page *page, gfp_t foo)
  * AIO. Modeled after NFS, they do this too.
  */
 /*
- * static ssize_t pvfs2_direct_IO(int rw,
+ * static ssize_t orangefs_direct_IO(int rw,
  *			struct kiocb *iocb,
  *			struct iov_iter *iter,
  *			loff_t offset)
@@ -150,7 +150,7 @@ const struct address_space_operations orangefs_address_operations = {
 	.readpages = orangefs_readpages,
 	.invalidatepage = orangefs_invalidatepage,
 	.releasepage = orangefs_releasepage,
-/*	.direct_IO = pvfs2_direct_IO */
+/*	.direct_IO = orangefs_direct_IO */
 };
 
 static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 333c87c8b0f5..63aa1e7fbdb6 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -9,7 +9,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /*
  * Get a newly allocated inode to go with a negative dentry.
diff --git a/fs/orangefs/pvfs2-bufmap.c b/fs/orangefs/orangefs-bufmap.c
similarity index 99%
rename from fs/orangefs/pvfs2-bufmap.c
rename to fs/orangefs/orangefs-bufmap.c
index 345287e871b1..c5368d852ee2 100644
--- a/fs/orangefs/pvfs2-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -4,8 +4,8 @@
  * See COPYING in top-level directory.
  */
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 DECLARE_WAIT_QUEUE_HEAD(orangefs_bufmap_init_waitq);
 
diff --git a/fs/orangefs/pvfs2-bufmap.h b/fs/orangefs/orangefs-bufmap.h
similarity index 100%
rename from fs/orangefs/pvfs2-bufmap.h
rename to fs/orangefs/orangefs-bufmap.h
diff --git a/fs/orangefs/pvfs2-cache.c b/fs/orangefs/orangefs-cache.c
similarity index 99%
rename from fs/orangefs/pvfs2-cache.c
rename to fs/orangefs/orangefs-cache.c
index a224831770f4..57e270246e3d 100644
--- a/fs/orangefs/pvfs2-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -5,7 +5,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /* tags assigned to kernel upcall operations */
 static __u64 next_tag_value;
diff --git a/fs/orangefs/pvfs2-debug.h b/fs/orangefs/orangefs-debug.h
similarity index 100%
rename from fs/orangefs/pvfs2-debug.h
rename to fs/orangefs/orangefs-debug.h
diff --git a/fs/orangefs/pvfs2-debugfs.c b/fs/orangefs/orangefs-debugfs.c
similarity index 99%
rename from fs/orangefs/pvfs2-debugfs.c
rename to fs/orangefs/orangefs-debugfs.c
index 315dc538b723..7319f1a2ecb8 100644
--- a/fs/orangefs/pvfs2-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -39,9 +39,9 @@
 
 #include <linux/uaccess.h>
 
-#include "pvfs2-debugfs.h"
+#include "orangefs-debugfs.h"
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 static int orangefs_debug_disabled = 1;
 
diff --git a/fs/orangefs/pvfs2-debugfs.h b/fs/orangefs/orangefs-debugfs.h
similarity index 100%
rename from fs/orangefs/pvfs2-debugfs.h
rename to fs/orangefs/orangefs-debugfs.h
diff --git a/fs/orangefs/pvfs2-dev-proto.h b/fs/orangefs/orangefs-dev-proto.h
similarity index 100%
rename from fs/orangefs/pvfs2-dev-proto.h
rename to fs/orangefs/orangefs-dev-proto.h
diff --git a/fs/orangefs/pvfs2-kernel.h b/fs/orangefs/orangefs-kernel.h
similarity index 99%
rename from fs/orangefs/pvfs2-kernel.h
rename to fs/orangefs/orangefs-kernel.h
index 33fcf3bccd2e..840872389fc5 100644
--- a/fs/orangefs/pvfs2-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -53,7 +53,7 @@
 
 #include <asm/unaligned.h>
 
-#include "pvfs2-dev-proto.h"
+#include "orangefs-dev-proto.h"
 
 #ifdef ORANGEFS_KERNEL_DEBUG
 #define ORANGEFS_DEFAULT_OP_TIMEOUT_SECS       10
diff --git a/fs/orangefs/pvfs2-mod.c b/fs/orangefs/orangefs-mod.c
similarity index 98%
rename from fs/orangefs/pvfs2-mod.c
rename to fs/orangefs/orangefs-mod.c
index d8642908a917..fa2fca6dca7c 100644
--- a/fs/orangefs/pvfs2-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -8,9 +8,9 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-debugfs.h"
-#include "pvfs2-sysfs.h"
+#include "orangefs-kernel.h"
+#include "orangefs-debugfs.h"
+#include "orangefs-sysfs.h"
 
 /* ORANGEFS_VERSION is a ./configure define */
 #ifndef ORANGEFS_VERSION
@@ -152,7 +152,7 @@ static int __init orangefs_init(void)
 	if (ret  < 0)
 		goto cleanup_inode;
 
-	/* Initialize the pvfsdev subsystem. */
+	/* Initialize the orangefsdev subsystem. */
 	ret = orangefs_dev_init();
 	if (ret < 0) {
 		gossip_err("orangefs: could not initialize device subsystem %d!\n",
diff --git a/fs/orangefs/pvfs2-sysfs.c b/fs/orangefs/orangefs-sysfs.c
similarity index 99%
rename from fs/orangefs/pvfs2-sysfs.c
rename to fs/orangefs/orangefs-sysfs.c
index f04de2593c79..3d360383ea22 100644
--- a/fs/orangefs/pvfs2-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -99,8 +99,8 @@
 #include <linux/init.h>
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-sysfs.h"
+#include "orangefs-kernel.h"
+#include "orangefs-sysfs.h"
 
 #define ORANGEFS_KOBJ_ID "orangefs"
 #define ACACHE_KOBJ_ID "acache"
diff --git a/fs/orangefs/pvfs2-sysfs.h b/fs/orangefs/orangefs-sysfs.h
similarity index 100%
rename from fs/orangefs/pvfs2-sysfs.h
rename to fs/orangefs/orangefs-sysfs.h
diff --git a/fs/orangefs/pvfs2-utils.c b/fs/orangefs/orangefs-utils.c
similarity index 99%
rename from fs/orangefs/pvfs2-utils.c
rename to fs/orangefs/orangefs-utils.c
index d132c5f712a4..fa2a46521b7a 100644
--- a/fs/orangefs/pvfs2-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -4,9 +4,9 @@
  * See COPYING in top-level directory.
  */
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-dev-proto.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-dev-proto.h"
+#include "orangefs-bufmap.h"
 
 __s32 fsid_of_op(struct orangefs_kernel_op_s *op)
 {
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index 5f10ebc83e76..03bbe7505a35 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -130,7 +130,7 @@ typedef __s64 ORANGEFS_offset;
 /* Bits 6 - 0 are reserved for the actual error code. */
 #define ORANGEFS_ERROR_NUMBER_BITS 0x7f
 
-/* Encoded errno values are decoded by PINT_errno_mapping in pvfs2-utils.c. */
+/* Encoded errno values decoded by PINT_errno_mapping in orangefs-utils.c. */
 
 /* Our own ORANGEFS protocol error codes. */
 #define ORANGEFS_ECANCEL    (1|ORANGEFS_NON_ERRNO_ERROR_BIT|ORANGEFS_ERROR_BIT)
@@ -352,7 +352,7 @@ struct dev_mask2_info_s {
 __s32 ORANGEFS_util_translate_mode(int mode);
 
 /* pvfs2-debug.h ************************************************************/
-#include "pvfs2-debug.h"
+#include "orangefs-debug.h"
 
 /* pvfs2-internal.h *********************************************************/
 #define llu(x) (unsigned long long)(x)
@@ -402,7 +402,7 @@ enum {
 
 /*
  * describes memory regions to map in the ORANGEFS_DEV_MAP ioctl.
- * NOTE: See devpvfs2-req.c for 32 bit compat structure.
+ * NOTE: See devorangefs-req.c for 32 bit compat structure.
  * Since this structure has a variable-sized layout that is different
  * on 32 and 64 bit platforms, we need to normalize to a 64 bit layout
  * on such systems before servicing ioctl calls from user-space binaries
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index c104de1ae5de..52bc522ea21c 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 #include <linux/parser.h>
 
diff --git a/fs/orangefs/symlink.c b/fs/orangefs/symlink.c
index 321f626b190b..1b3ae63463dc 100644
--- a/fs/orangefs/symlink.c
+++ b/fs/orangefs/symlink.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 static const char *orangefs_follow_link(struct dentry *dentry, void **cookie)
 {
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index cfc8dc59c4eb..c731cbdd5fbd 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -13,8 +13,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 /*
  * What we do in this function is to walk the list of operations that are
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index aeb3c3083591..0e4e01602738 100644
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
 
-- 
2.20.1