fscache: Pass object size in rather than calling back for it

Pass the object size in to fscache_acquire_cookie() and
fscache_write_page() rather than the netfs providing a callback by which it
can be received.  This makes it easier to update the size of the object
when a new page is written that extends the object.

The current object size is also passed by fscache to the check_aux
function, obviating the need to store it in the aux data.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Anna Schumaker <anna.schumaker@netapp.com>
Tested-by: Steve Dickson <steved@redhat.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 3264dcfdc92a..222bc5d8b62c 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -441,7 +441,7 @@ static int cachefiles_attr_changed(struct fscache_object *_object)
         loff_t oi_size;
         int ret;
 
-        _object->cookie->def->get_attr(_object->cookie->netfs_data, &ni_size);
+        ni_size = _object->store_limit_l;
 
         _enter("{OBJ%x},[%llu]",
                _object->debug_id, (unsigned long long) ni_size);
@@ -513,8 +513,7 @@ static void cachefiles_invalidate_object(struct fscache_operation *op)
         cache = container_of(object->fscache.cache,
                              struct cachefiles_cache, cache);
 
-        op->object->cookie->def->get_attr(op->object->cookie->netfs_data,
-                                          &ni_size);
+        ni_size = op->object->store_limit_l;
 
         _enter("{OBJ%x},[%llu]",
                op->object->debug_id, (unsigned long long)ni_size);
diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
index d84423c264af..0a29a00aed2e 100644
--- a/fs/cachefiles/xattr.c
+++ b/fs/cachefiles/xattr.c
@@ -182,7 +182,8 @@ int cachefiles_check_auxdata(struct cachefiles_object *object)
                 goto error;
 
         xlen--;
-        validity = fscache_check_aux(&object->fscache, &auxbuf->data, xlen);
+        validity = fscache_check_aux(&object->fscache, &auxbuf->data, xlen,
+                                     i_size_read(d_backing_inode(dentry)));
         if (validity != FSCACHE_CHECKAUX_OKAY)
                 goto error;
 
@@ -251,7 +252,8 @@ int cachefiles_check_object_xattr(struct cachefiles_object *object,
                        object->fscache.cookie->def->name, dlen);
 
                 result = fscache_check_aux(&object->fscache,
-                                           &auxbuf->data, dlen);
+                                           &auxbuf->data, dlen,
+                                           i_size_read(d_backing_inode(dentry)));
 
                 switch (result) {
                         /* entry okay as is */