Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / fs / netfs / read_helper.c

diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c
index 75c76cb..6169659 100644 (file)
--- a/fs/netfs/read_helper.c
+++ b/fs/netfs/read_helper.c
@@ -170,7 +170,7 @@ static void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error
  */
 static void netfs_read_from_cache(struct netfs_read_request *rreq,
                                  struct netfs_read_subrequest *subreq,
-                                 bool seek_data)
+                                 enum netfs_read_from_hole read_hole)
 {
        struct netfs_cache_resources *cres = &rreq->cache_resources;
        struct iov_iter iter;
@@ -180,7 +180,7 @@ static void netfs_read_from_cache(struct netfs_read_request *rreq,
                        subreq->start + subreq->transferred,
                        subreq->len   - subreq->transferred);
 
-       cres->ops->read(cres, subreq->start, &iter, seek_data,
+       cres->ops->read(cres, subreq->start, &iter, read_hole,
                        netfs_cache_read_terminated, subreq);
 }
 
@@ -323,7 +323,7 @@ static void netfs_rreq_do_write_to_cache(struct netfs_read_request *rreq)
                }
 
                ret = cres->ops->prepare_write(cres, &subreq->start, &subreq->len,
-                                              rreq->i_size);
+                                              rreq->i_size, true);
                if (ret < 0) {
                        trace_netfs_failure(rreq, subreq, ret, netfs_fail_prepare_write);
                        trace_netfs_sreq(subreq, netfs_sreq_trace_write_skip);
@@ -461,7 +461,7 @@ static void netfs_rreq_short_read(struct netfs_read_request *rreq,
        netfs_get_read_subrequest(subreq);
        atomic_inc(&rreq->nr_rd_ops);
        if (subreq->source == NETFS_READ_FROM_CACHE)
-               netfs_read_from_cache(rreq, subreq, true);
+               netfs_read_from_cache(rreq, subreq, NETFS_READ_HOLE_CLEAR);
        else
                netfs_read_from_server(rreq, subreq);
 }
@@ -789,7 +789,7 @@ static bool netfs_rreq_submit_slice(struct netfs_read_request *rreq,
                netfs_read_from_server(rreq, subreq);
                break;
        case NETFS_READ_FROM_CACHE:
-               netfs_read_from_cache(rreq, subreq, false);
+               netfs_read_from_cache(rreq, subreq, NETFS_READ_HOLE_IGNORE);
                break;
        default:
                BUG();