From b8a99a8f9f0aebf2a75bb0d9280bff7e7ac9b57e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 16 Feb 2016 20:10:26 -0500 Subject: 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 Signed-off-by: Mike Marshall --- fs/orangefs/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs/orangefs/file.c') diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index db9dd6ebcc3f..63e6a10ab13d 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -87,7 +87,6 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod { struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); struct orangefs_khandle *handle = &orangefs_inode->refn.khandle; - struct orangefs_bufmap *bufmap = NULL; struct orangefs_kernel_op_s *new_op = NULL; struct iov_iter saved = *iter; int buffer_index = -1; @@ -104,11 +103,12 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod populate_shared_memory: /* get a shared buffer index */ - ret = orangefs_bufmap_get(&bufmap, &buffer_index); - if (ret < 0) { + buffer_index = orangefs_bufmap_get(); + if (buffer_index < 0) { + ret = buffer_index; gossip_debug(GOSSIP_FILE_DEBUG, - "%s: orangefs_bufmap_get failure (%ld)\n", - __func__, (long)ret); + "%s: orangefs_bufmap_get failure (%zd)\n", + __func__, ret); goto out; } gossip_debug(GOSSIP_FILE_DEBUG, -- cgit v1.2.3