Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index ef42729216d1fff5c723f951d4c2c5bf2592e9a1..9a293609a0221c596c6366995dcd284b4a8628e1 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -579,7 +579,7 @@ static int search_by_key_reada(struct super_block *s,
                if (!buffer_uptodate(bh[j])) {
                        if (depth == -1)
                                depth = reiserfs_write_unlock_nested(s);
-                       ll_rw_block(REQ_OP_READ, REQ_RAHEAD, 1, bh + j);
+                       ll_rw_block(REQ_OP_READ | REQ_RAHEAD, 1, bh + j);
                }
                brelse(bh[j]);
        }
@@ -685,7 +685,7 @@ int search_by_key(struct super_block *sb, const struct cpu_key *key,
                        if (!buffer_uptodate(bh) && depth == -1)
                                depth = reiserfs_write_unlock_nested(sb);
 
-                       ll_rw_block(REQ_OP_READ, 0, 1, &bh);
+                       ll_rw_block(REQ_OP_READ, 1, &bh);
                        wait_on_buffer(bh);
 
                        if (depth != -1)