diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2021-03-28 17:18:11 -0400 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2021-04-28 07:33:04 -0400 |
| commit | 0c4b7cadd1ade1916a3a6dab0d13ff5665b04cae (patch) | |
| tree | 75282e713aa47f15fbf3e9810335ebeea8f92baf /fs/orangefs/file.c | |
| parent | acd3d28594536e9096c1ea76c5867d8a68babef6 (diff) | |
| download | linux-0c4b7cadd1ade1916a3a6dab0d13ff5665b04cae.tar.gz linux-0c4b7cadd1ade1916a3a6dab0d13ff5665b04cae.tar.xz | |
Orangef: implement orangefs_readahead.
Also remove open-coded readahead logic from orangefs_readpage.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/file.c')
| -rw-r--r-- | fs/orangefs/file.c | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index ccef8c9dd516..86810e5d7914 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -248,21 +248,7 @@ populate_shared_memory: * or it can pointers to struct page's */ - /* - * When reading, readahead_size will only be zero when - * we're doing O_DIRECT, otherwise we got here from - * orangefs_readpage. - * - * If we got here from orangefs_readpage we want to - * copy either a page or the whole file into the io - * vector, whichever is smaller. - */ - if (readahead_size) - copy_amount = - min(new_op->downcall.resp.io.amt_complete, - (__s64)PAGE_SIZE); - else - copy_amount = new_op->downcall.resp.io.amt_complete; + copy_amount = new_op->downcall.resp.io.amt_complete; ret = orangefs_bufmap_copy_to_iovec(iter, buffer_index, copy_amount); @@ -283,19 +269,11 @@ populate_shared_memory: out: if (buffer_index >= 0) { - if ((readahead_size) && (type == ORANGEFS_IO_READ)) { - /* readpage */ - *index_return = buffer_index; - gossip_debug(GOSSIP_FILE_DEBUG, - "%s: hold on to buffer_index :%d:\n", - __func__, buffer_index); - } else { - /* O_DIRECT */ - orangefs_bufmap_put(buffer_index); - gossip_debug(GOSSIP_FILE_DEBUG, - "%s(%pU): PUT buffer_index %d\n", - __func__, handle, buffer_index); - } + orangefs_bufmap_put(buffer_index); + gossip_debug(GOSSIP_FILE_DEBUG, + "%s(%pU): PUT buffer_index %d\n", + __func__, handle, buffer_index); + buffer_index = -1; } op_release(new_op); return ret; |