[Linux-cachefs] [PATCH 15/67] fscache: Disable fscache_begin_operation()

[David Howells]

Disable fscache_begin_operation() so that the operation manager can be
removed and replaced.

Signed-off-by: David Howells <dhowe...@redhat.com>
---

 fs/cachefiles/io.c |   13 ++++++++++++-
 fs/fscache/io.c    |    2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/fs/cachefiles/io.c b/fs/cachefiles/io.c
index 5ead97de4bb7..4cc57be88f37 100644
--- a/fs/cachefiles/io.c
+++ b/fs/cachefiles/io.c
@@ -271,6 +271,7 @@ static int cachefiles_write(struct netfs_cache_resources 
*cres,
 static enum netfs_read_source cachefiles_prepare_read(struct 
netfs_read_subrequest *subreq,
                                                      loff_t i_size)
 {
+#if 0
        struct fscache_operation *op = subreq->rreq->cache_resources.cache_priv;
        struct cachefiles_object *object;
        struct cachefiles_cache *cache;
@@ -335,6 +336,9 @@ static enum netfs_read_source 
cachefiles_prepare_read(struct netfs_read_subreque
 out:
        cachefiles_end_secure(cache, saved_cred);
        return ret;
+#endif
+       return subreq->start >= i_size ?
+               NETFS_FILL_WITH_ZEROES : NETFS_DOWNLOAD_FROM_SERVER;
 }
 
 /*
@@ -359,6 +363,7 @@ static int cachefiles_prepare_write(struct 
netfs_cache_resources *cres,
 static int cachefiles_prepare_fallback_write(struct netfs_cache_resources 
*cres,
                                             pgoff_t index)
 {
+#if 0
        struct fscache_operation *op = cres->cache_priv;
        struct cachefiles_object *object;
        struct cachefiles_cache *cache;
@@ -369,6 +374,8 @@ static int cachefiles_prepare_fallback_write(struct 
netfs_cache_resources *cres,
        cache = container_of(object->fscache.cache,
                             struct cachefiles_cache, cache);
        return cachefiles_has_space(cache, 0, 1);
+#endif
+       return -ENOBUFS;
 }
 
 /*
@@ -376,6 +383,7 @@ static int cachefiles_prepare_fallback_write(struct 
netfs_cache_resources *cres,
  */
 static void cachefiles_end_operation(struct netfs_cache_resources *cres)
 {
+#if 0
        struct fscache_operation *op = cres->cache_priv;
        struct file *file = cres->cache_priv2;
 
@@ -387,8 +395,8 @@ static void cachefiles_end_operation(struct 
netfs_cache_resources *cres)
                fscache_op_complete(op, false);
                fscache_put_operation(op);
        }
-
        _leave("");
+#endif
 }
 
 static const struct netfs_cache_ops cachefiles_netfs_cache_ops = {
@@ -406,6 +414,7 @@ static const struct netfs_cache_ops 
cachefiles_netfs_cache_ops = {
 int cachefiles_begin_operation(struct netfs_cache_resources *cres,
                               struct fscache_operation *op)
 {
+#if 0
        struct cachefiles_object *object;
        struct cachefiles_cache *cache;
        struct path path;
@@ -441,5 +450,7 @@ int cachefiles_begin_operation(struct netfs_cache_resources 
*cres,
 
 error_file:
        fput(file);
+#endif
+       cres->ops = &cachefiles_netfs_cache_ops;
        return -EIO;
 }
diff --git a/fs/fscache/io.c b/fs/fscache/io.c
index 7ac34c2e45fe..2547892a6064 100644
--- a/fs/fscache/io.c
+++ b/fs/fscache/io.c
@@ -31,6 +31,7 @@ int __fscache_begin_operation(struct netfs_cache_resources 
*cres,
                              struct fscache_cookie *cookie,
                              bool for_write)
 {
+#if 0
        struct fscache_operation *op;
        struct fscache_object *object;
        bool wake_cookie = false;
@@ -144,6 +145,7 @@ int __fscache_begin_operation(struct netfs_cache_resources 
*cres,
                fscache_stat(&fscache_n_stores_nobufs);
        else
                fscache_stat(&fscache_n_retrievals_nobufs);
+#endif
        _leave(" = -ENOBUFS");
        return -ENOBUFS;
 }


--
Linux-cachefs mailing list
Linux-cachefs@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-cachefs