summaryrefslogtreecommitdiffstats
path: root/fs/orangefs/pvfs2-cache.c
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2015-11-13 14:26:09 -0500
committerMike Marshall <hubcap@omnibond.com>2015-11-13 14:43:11 -0500
commitf0ed4418d46db587eca981065ef5014332678606 (patch)
tree65437d6301c6d0dd9a69e39e113f71e3a8c03f5b /fs/orangefs/pvfs2-cache.c
parentb5bbc84328556bb653412b8e9682b8fdb091866a (diff)
downloadlinux-f0ed4418d46db587eca981065ef5014332678606.tar.bz2
Orangefs: Remove upcall trailers which are not used.
Also removes remnants of iox (readx/writex) which previously used trailers, but no longer exist. Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/pvfs2-cache.c')
-rw-r--r--fs/orangefs/pvfs2-cache.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/orangefs/pvfs2-cache.c b/fs/orangefs/pvfs2-cache.c
index 15251884ba4a..f982616a4349 100644
--- a/fs/orangefs/pvfs2-cache.c
+++ b/fs/orangefs/pvfs2-cache.c
@@ -103,13 +103,11 @@ char *get_opname_string(struct pvfs2_kernel_op_s *new_op)
return "OP_FSYNC";
else if (type == PVFS2_VFS_OP_FSKEY)
return "OP_FSKEY";
- else if (type == PVFS2_VFS_OP_FILE_IOX)
- return "OP_FILE_IOX";
}
return "OP_UNKNOWN?";
}
-static struct pvfs2_kernel_op_s *op_alloc_common(__s32 op_linger, __s32 type)
+struct pvfs2_kernel_op_s *op_alloc(__s32 type)
{
struct pvfs2_kernel_op_s *new_op = NULL;
@@ -145,24 +143,12 @@ static struct pvfs2_kernel_op_s *op_alloc_common(__s32 op_linger, __s32 type)
new_op->upcall.gid = from_kgid(current_user_ns(),
current_fsgid());
-
- new_op->op_linger = new_op->op_linger_tmp = op_linger;
} else {
gossip_err("op_alloc: kmem_cache_alloc failed!\n");
}
return new_op;
}
-struct pvfs2_kernel_op_s *op_alloc(__s32 type)
-{
- return op_alloc_common(1, type);
-}
-
-struct pvfs2_kernel_op_s *op_alloc_trailer(__s32 type)
-{
- return op_alloc_common(2, type);
-}
-
void op_release(struct pvfs2_kernel_op_s *pvfs2_op)
{
if (pvfs2_op) {