summaryrefslogtreecommitdiffstats
path: root/fs/orangefs/file.c
diff options
context:
space:
mode:
authorAl Viro2016-02-12 03:34:52 +0100
committerMike Marshall2016-02-12 21:05:33 +0100
commit1357d06d49d1f87af48ab768d34af55bff18b0c3 (patch)
tree18b208b4117819d48d4a16f7b05bd10b94cfd407 /fs/orangefs/file.c
parentorangefs: get rid of handle_io_error() (diff)
downloadkernel-qcow2-linux-1357d06d49d1f87af48ab768d34af55bff18b0c3.tar.gz
kernel-qcow2-linux-1357d06d49d1f87af48ab768d34af55bff18b0c3.tar.xz
kernel-qcow2-linux-1357d06d49d1f87af48ab768d34af55bff18b0c3.zip
get rid of bufmap argument of orangefs_bufmap_put()
it's always equal to __orangefs_bufmap and the latter can't change until we are done Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/file.c')
-rw-r--r--fs/orangefs/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index dafa03ef0107..193671c137c3 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -170,7 +170,7 @@ populate_shared_memory:
* a new shared memory location.
*/
if (ret == -EAGAIN && op_state_purged(new_op)) {
- orangefs_bufmap_put(bufmap, buffer_index);
+ orangefs_bufmap_put(buffer_index);
buffer_index = -1;
if (type == ORANGEFS_IO_WRITE)
*iter = saved;
@@ -190,7 +190,7 @@ populate_shared_memory:
} else {
complete(&new_op->done);
}
- orangefs_bufmap_put(bufmap, buffer_index);
+ orangefs_bufmap_put(buffer_index);
buffer_index = -1;
/*
* don't write an error to syslog on signaled operation
@@ -239,7 +239,7 @@ done_copying:
out:
if (buffer_index >= 0) {
- orangefs_bufmap_put(bufmap, buffer_index);
+ orangefs_bufmap_put(buffer_index);
gossip_debug(GOSSIP_FILE_DEBUG,
"%s(%pU): PUT buffer_index %d\n",
__func__, handle, buffer_index);