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>
This commit is contained in:
Mike Marshall 2015-12-04 12:56:14 -05:00
parent 8bb8aefd5a
commit 575e946125
26 changed files with 47 additions and 47 deletions

View File

@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 0
EXTRAVERSION = -rc1
EXTRAVERSION = -rc1-o
NAME = Blurry Fish Butt
# *DOCUMENTATION*

View File

@ -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

View File

@ -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>

View File

@ -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)

View File

@ -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>

View File

@ -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;

View File

@ -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

View File

@ -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)

View File

@ -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.

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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",

View File

@ -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"

View File

@ -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)
{

View File

@ -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

View File

@ -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>

View File

@ -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)
{

View File

@ -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

View File

@ -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>