summaryrefslogtreecommitdiff
path: root/fs/orangefs/dir.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-02-17 04:10:26 +0300
committerMike Marshall <hubcap@omnibond.com>2016-03-26 05:30:54 +0300
commitb8a99a8f9f0aebf2a75bb0d9280bff7e7ac9b57e (patch)
treed987f21f5f1c7ea83b62fcf7d0bda6f10971d285 /fs/orangefs/dir.c
parentbf6bf606e545cb31c29499b354c13b2621acd649 (diff)
downloadlinux-b8a99a8f9f0aebf2a75bb0d9280bff7e7ac9b57e.tar.xz
orangefs: saner calling conventions for getting a slot
just have it return the slot number or -E... - the caller checks the sign anyway Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/dir.c')
-rw-r--r--fs/orangefs/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 53a411732606..f30b6ecacdd1 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -141,7 +141,6 @@ out:
*/
static int orangefs_readdir(struct file *file, struct dir_context *ctx)
{
- struct orangefs_bufmap *bufmap = NULL;
int ret = 0;
int buffer_index;
/*
@@ -205,8 +204,9 @@ static int orangefs_readdir(struct file *file, struct dir_context *ctx)
new_op->upcall.req.readdir.token = *ptoken;
get_new_buffer_index:
- ret = orangefs_readdir_index_get(&bufmap, &buffer_index);
- if (ret < 0) {
+ buffer_index = orangefs_readdir_index_get();
+ if (buffer_index < 0) {
+ ret = buffer_index;
gossip_lerr("orangefs_readdir: orangefs_readdir_index_get() failure (%d)\n",
ret);
goto out_free_op;