summaryrefslogtreecommitdiff
path: root/fs/orangefs/dir.c
diff options
context:
space:
mode:
authorYi Liu <yi9@clemson.edu>2015-11-24 23:12:14 +0300
committerMike Marshall <hubcap@omnibond.com>2015-12-03 22:45:44 +0300
commit8bb8aefd5afb54a25a002feb4ec70011812d06a0 (patch)
tree08ca295ca2541c889e2805f92ae0aa699b0a13df /fs/orangefs/dir.c
parent555fa0fa618b846c5b38406347b7d53ace320ac6 (diff)
downloadlinux-8bb8aefd5afb54a25a002feb4ec70011812d06a0.tar.xz
OrangeFS: Change almost all instances of the string PVFS2 to OrangeFS.
OrangeFS was formerly known as PVFS2 and retains the name in many places. I leave the device /dev/pvfs2-req since this affects userspace. I leave the filesystem type pvfs2 since this affects userspace. Further the OrangeFS sysint library reads fstab for an entry of type pvfs2 independently of kernel mounts. I leave extended attribute keys user.pvfs2 and system.pvfs2 as the sysint library understands these. I leave references to userspace binaries still named pvfs2. I leave the filenames. Signed-off-by: Yi Liu <yi9@clemson.edu> [martin@omnibond.com: clairify above constraints and merge] Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/dir.c')
-rw-r--r--fs/orangefs/dir.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 3049cd61b700..452d589b9747 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -10,7 +10,7 @@
struct readdir_handle_s {
int buffer_index;
- struct pvfs2_readdir_response_s readdir_response;
+ struct orangefs_readdir_response_s readdir_response;
void *dents_buf;
};
@@ -18,28 +18,28 @@ struct readdir_handle_s {
* decode routine needed by kmod to make sense of the shared page for readdirs.
*/
static long decode_dirents(char *ptr, size_t size,
- struct pvfs2_readdir_response_s *readdir)
+ struct orangefs_readdir_response_s *readdir)
{
int i;
- struct pvfs2_readdir_response_s *rd =
- (struct pvfs2_readdir_response_s *) ptr;
+ struct orangefs_readdir_response_s *rd =
+ (struct orangefs_readdir_response_s *) ptr;
char *buf = ptr;
- if (size < offsetof(struct pvfs2_readdir_response_s, dirent_array))
+ if (size < offsetof(struct orangefs_readdir_response_s, dirent_array))
return -EINVAL;
readdir->token = rd->token;
- readdir->pvfs_dirent_outcount = rd->pvfs_dirent_outcount;
- readdir->dirent_array = kcalloc(readdir->pvfs_dirent_outcount,
+ readdir->orangefs_dirent_outcount = rd->orangefs_dirent_outcount;
+ readdir->dirent_array = kcalloc(readdir->orangefs_dirent_outcount,
sizeof(*readdir->dirent_array),
GFP_KERNEL);
if (readdir->dirent_array == NULL)
return -ENOMEM;
- buf += offsetof(struct pvfs2_readdir_response_s, dirent_array);
- size -= offsetof(struct pvfs2_readdir_response_s, dirent_array);
+ buf += offsetof(struct orangefs_readdir_response_s, dirent_array);
+ size -= offsetof(struct orangefs_readdir_response_s, dirent_array);
- for (i = 0; i < readdir->pvfs_dirent_outcount; i++) {
+ for (i = 0; i < readdir->orangefs_dirent_outcount; i++) {
__u32 len;
if (size < 4)
@@ -60,7 +60,7 @@ static long decode_dirents(char *ptr, size_t size,
buf += len;
readdir->dirent_array[i].khandle =
- *(struct pvfs2_khandle *) buf;
+ *(struct orangefs_khandle *) buf;
buf += 16;
}
return buf - ptr;
@@ -98,7 +98,7 @@ static long readdir_handle_ctor(struct readdir_handle_s *rhandle, void *buf,
return ret;
}
-static void readdir_handle_dtor(struct pvfs2_bufmap *bufmap,
+static void readdir_handle_dtor(struct orangefs_bufmap *bufmap,
struct readdir_handle_s *rhandle)
{
if (rhandle == NULL)
@@ -123,9 +123,9 @@ static void readdir_handle_dtor(struct pvfs2_bufmap *bufmap,
/*
* Read directory entries from an instance of an open directory.
*/
-static int pvfs2_readdir(struct file *file, struct dir_context *ctx)
+static int orangefs_readdir(struct file *file, struct dir_context *ctx)
{
- struct pvfs2_bufmap *bufmap = NULL;
+ struct orangefs_bufmap *bufmap = NULL;
int ret = 0;
int buffer_index;
/*
@@ -136,8 +136,8 @@ static int pvfs2_readdir(struct file *file, struct dir_context *ctx)
__u64 pos = 0;
ino_t ino = 0;
struct dentry *dentry = file->f_path.dentry;
- struct pvfs2_kernel_op_s *new_op = NULL;
- struct pvfs2_inode_s *pvfs2_inode = PVFS2_I(dentry->d_inode);
+ struct orangefs_kernel_op_s *new_op = NULL;
+ struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(dentry->d_inode);
int buffer_full = 0;
struct readdir_handle_s rhandle;
int i = 0;
@@ -155,26 +155,26 @@ static int pvfs2_readdir(struct file *file, struct dir_context *ctx)
pos = (__u64) ctx->pos;
/* are we done? */
- if (pos == PVFS_READDIR_END) {
+ if (pos == ORANGEFS_READDIR_END) {
gossip_debug(GOSSIP_DIR_DEBUG,
"Skipping to termination path\n");
return 0;
}
gossip_debug(GOSSIP_DIR_DEBUG,
- "pvfs2_readdir called on %s (pos=%llu)\n",
+ "orangefs_readdir called on %s (pos=%llu)\n",
dentry->d_name.name, llu(pos));
rhandle.buffer_index = -1;
rhandle.dents_buf = NULL;
memset(&rhandle.readdir_response, 0, sizeof(rhandle.readdir_response));
- new_op = op_alloc(PVFS2_VFS_OP_READDIR);
+ new_op = op_alloc(ORANGEFS_VFS_OP_READDIR);
if (!new_op)
return -ENOMEM;
new_op->uses_shared_memory = 1;
- new_op->upcall.req.readdir.refn = pvfs2_inode->refn;
+ new_op->upcall.req.readdir.refn = orangefs_inode->refn;
new_op->upcall.req.readdir.max_dirent_count = MAX_DIRENT_COUNT_READDIR;
gossip_debug(GOSSIP_DIR_DEBUG,
@@ -187,14 +187,14 @@ static int pvfs2_readdir(struct file *file, struct dir_context *ctx)
get_new_buffer_index:
ret = readdir_index_get(&bufmap, &buffer_index);
if (ret < 0) {
- gossip_lerr("pvfs2_readdir: readdir_index_get() failure (%d)\n",
+ gossip_lerr("orangefs_readdir: readdir_index_get() failure (%d)\n",
ret);
goto out_free_op;
}
new_op->upcall.req.readdir.buf_index = buffer_index;
ret = service_operation(new_op,
- "pvfs2_readdir",
+ "orangefs_readdir",
get_interruptible_flag(dentry->d_inode));
gossip_debug(GOSSIP_DIR_DEBUG,
@@ -238,7 +238,7 @@ get_new_buffer_index:
new_op->downcall.trailer_size,
buffer_index);
if (bytes_decoded < 0) {
- gossip_err("pvfs2_readdir: Could not decode trailer buffer into a readdir response %d\n",
+ gossip_err("orangefs_readdir: Could not decode trailer buffer into a readdir response %d\n",
ret);
ret = bytes_decoded;
readdir_index_put(bufmap, buffer_index);
@@ -246,7 +246,7 @@ get_new_buffer_index:
}
if (bytes_decoded != new_op->downcall.trailer_size) {
- gossip_err("pvfs2_readdir: # bytes decoded (%ld) "
+ gossip_err("orangefs_readdir: # bytes decoded (%ld) "
"!= trailer size (%ld)\n",
bytes_decoded,
(long)new_op->downcall.trailer_size);
@@ -255,7 +255,7 @@ get_new_buffer_index:
}
/*
- * pvfs2 doesn't actually store dot and dot-dot, but
+ * orangefs doesn't actually store dot and dot-dot, but
* we need to have them represented.
*/
if (pos == 0) {
@@ -279,19 +279,19 @@ get_new_buffer_index:
}
/*
- * we stored PVFS_ITERATE_NEXT in ctx->pos last time around
+ * we stored ORANGEFS_ITERATE_NEXT in ctx->pos last time around
* to prevent "finding" dot and dot-dot on any iteration
* other than the first.
*/
- if (ctx->pos == PVFS_ITERATE_NEXT)
+ if (ctx->pos == ORANGEFS_ITERATE_NEXT)
ctx->pos = 0;
for (i = ctx->pos;
- i < rhandle.readdir_response.pvfs_dirent_outcount;
+ i < rhandle.readdir_response.orangefs_dirent_outcount;
i++) {
len = rhandle.readdir_response.dirent_array[i].d_length;
current_entry = rhandle.readdir_response.dirent_array[i].d_name;
- current_ino = pvfs2_khandle_to_ino(
+ current_ino = orangefs_khandle_to_ino(
&(rhandle.readdir_response.dirent_array[i].khandle));
gossip_debug(GOSSIP_DIR_DEBUG,
@@ -323,28 +323,28 @@ get_new_buffer_index:
*/
if (ret) {
*ptoken = rhandle.readdir_response.token;
- ctx->pos = PVFS_ITERATE_NEXT;
+ ctx->pos = ORANGEFS_ITERATE_NEXT;
}
/*
* Did we hit the end of the directory?
*/
- if (rhandle.readdir_response.token == PVFS_READDIR_END &&
+ if (rhandle.readdir_response.token == ORANGEFS_READDIR_END &&
!buffer_full) {
gossip_debug(GOSSIP_DIR_DEBUG,
- "End of dir detected; setting ctx->pos to PVFS_READDIR_END.\n");
- ctx->pos = PVFS_READDIR_END;
+ "End of dir detected; setting ctx->pos to ORANGEFS_READDIR_END.\n");
+ ctx->pos = ORANGEFS_READDIR_END;
}
out_destroy_handle:
readdir_handle_dtor(bufmap, &rhandle);
out_free_op:
op_release(new_op);
- gossip_debug(GOSSIP_DIR_DEBUG, "pvfs2_readdir returning %d\n", ret);
+ gossip_debug(GOSSIP_DIR_DEBUG, "orangefs_readdir returning %d\n", ret);
return ret;
}
-static int pvfs2_dir_open(struct inode *inode, struct file *file)
+static int orangefs_dir_open(struct inode *inode, struct file *file)
{
__u64 *ptoken;
@@ -353,21 +353,21 @@ static int pvfs2_dir_open(struct inode *inode, struct file *file)
return -ENOMEM;
ptoken = file->private_data;
- *ptoken = PVFS_READDIR_START;
+ *ptoken = ORANGEFS_READDIR_START;
return 0;
}
-static int pvfs2_dir_release(struct inode *inode, struct file *file)
+static int orangefs_dir_release(struct inode *inode, struct file *file)
{
- pvfs2_flush_inode(inode);
+ orangefs_flush_inode(inode);
kfree(file->private_data);
return 0;
}
-/** PVFS2 implementation of VFS directory operations */
-const struct file_operations pvfs2_dir_operations = {
+/** ORANGEFS implementation of VFS directory operations */
+const struct file_operations orangefs_dir_operations = {
.read = generic_read_dir,
- .iterate = pvfs2_readdir,
- .open = pvfs2_dir_open,
- .release = pvfs2_dir_release,
+ .iterate = orangefs_readdir,
+ .open = orangefs_dir_open,
+ .release = orangefs_dir_release,
};