diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-13 21:04:51 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-02-19 13:45:54 -0500 |
| commit | 82d37f19ff885ece97b8a072182e39c9dc4ead7d (patch) | |
| tree | 3fd02055b7c7e55765b3315320d419041f825504 /fs/orangefs | |
| parent | ea2c9c9f6574e835cbc903c94b82b5a34a334866 (diff) | |
| download | blackbird-obmc-linux-82d37f19ff885ece97b8a072182e39c9dc4ead7d.tar.gz blackbird-obmc-linux-82d37f19ff885ece97b8a072182e39c9dc4ead7d.zip | |
orangefs_readdir_index_put(): get rid of bufmap argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/dir.c | 15 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-bufmap.c | 2 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-bufmap.h | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c index 6f5836d6a7a3..c9b8d0ced833 100644 --- a/fs/orangefs/dir.c +++ b/fs/orangefs/dir.c @@ -170,8 +170,7 @@ static long readdir_handle_ctor(struct readdir_handle_s *rhandle, void *buf, return ret; } -static void readdir_handle_dtor(struct orangefs_bufmap *bufmap, - struct readdir_handle_s *rhandle) +static void readdir_handle_dtor(struct readdir_handle_s *rhandle) { if (rhandle == NULL) return; @@ -181,7 +180,7 @@ static void readdir_handle_dtor(struct orangefs_bufmap *bufmap, rhandle->readdir_response.dirent_array = NULL; if (rhandle->buffer_index >= 0) { - orangefs_readdir_index_put(bufmap, rhandle->buffer_index); + orangefs_readdir_index_put(rhandle->buffer_index); rhandle->buffer_index = -1; } if (rhandle->dents_buf) { @@ -284,14 +283,14 @@ get_new_buffer_index: gossip_debug(GOSSIP_DIR_DEBUG, "%s: Getting new buffer_index for retry of readdir..\n", __func__); - orangefs_readdir_index_put(bufmap, buffer_index); + orangefs_readdir_index_put(buffer_index); goto get_new_buffer_index; } if (ret == -EIO && op_state_purged(new_op)) { gossip_err("%s: Client is down. Aborting readdir call.\n", __func__); - orangefs_readdir_index_put(bufmap, buffer_index); + orangefs_readdir_index_put(buffer_index); goto out_free_op; } @@ -299,7 +298,7 @@ get_new_buffer_index: gossip_debug(GOSSIP_DIR_DEBUG, "Readdir request failed. Status:%d\n", new_op->downcall.status); - orangefs_readdir_index_put(bufmap, buffer_index); + orangefs_readdir_index_put(buffer_index); if (ret >= 0) ret = new_op->downcall.status; goto out_free_op; @@ -314,7 +313,7 @@ get_new_buffer_index: gossip_err("orangefs_readdir: Could not decode trailer buffer into a readdir response %d\n", ret); ret = bytes_decoded; - orangefs_readdir_index_put(bufmap, buffer_index); + orangefs_readdir_index_put(buffer_index); goto out_free_op; } @@ -410,7 +409,7 @@ get_new_buffer_index: } out_destroy_handle: - readdir_handle_dtor(bufmap, &rhandle); + readdir_handle_dtor(&rhandle); out_free_op: op_release(new_op); gossip_debug(GOSSIP_DIR_DEBUG, "orangefs_readdir returning %d\n", ret); diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index 96faf4ee6529..44d437dbfce0 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -502,7 +502,7 @@ int orangefs_readdir_index_get(struct orangefs_bufmap **mapp, int *buffer_index) return ret; } -void orangefs_readdir_index_put(struct orangefs_bufmap *bufmap, int buffer_index) +void orangefs_readdir_index_put(int buffer_index) { put(&readdir_map, buffer_index); } diff --git a/fs/orangefs/orangefs-bufmap.h b/fs/orangefs/orangefs-bufmap.h index f0684f0085d1..0be62be373f7 100644 --- a/fs/orangefs/orangefs-bufmap.h +++ b/fs/orangefs/orangefs-bufmap.h @@ -25,7 +25,7 @@ void orangefs_bufmap_put(int buffer_index); int orangefs_readdir_index_get(struct orangefs_bufmap **mapp, int *buffer_index); -void orangefs_readdir_index_put(struct orangefs_bufmap *bufmap, int buffer_index); +void orangefs_readdir_index_put(int buffer_index); int orangefs_bufmap_copy_from_iovec(struct orangefs_bufmap *bufmap, struct iov_iter *iter, |
