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>
diff --git a/Makefile b/Makefile
index 3a0234f..aca4a73 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 828b36a..a9d6a96 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 5e27d5f..03f89dbb 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 12c916f..5dd9841 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 e18149f..e74938d 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 452d589..c043894 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 ae5d8ed..171013a 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 @@
}
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 58e8318..4724c92b 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 @@
* 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 @@
.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 333c87c..63aa1e7 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 345287e..c5368d8 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 a224831..57e2702 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 315dc53..7319f1a 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 33fcf3b..8408723 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 d864290..fa2fca6 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 @@
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 f04de25..3d36038 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 d132c5f..fa2a465 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 5f10ebc..03bbe75 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -130,7 +130,7 @@
/* 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 @@
__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 @@
/*
* 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 c104de1..52bc522 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 321f626..1b3ae63 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 cfc8dc5..c731cbd 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 aeb3c30..0e4e016 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>