diff options
| author | David Howells <dhowells@redhat.com> | 2018-04-04 13:41:28 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2018-04-06 14:05:14 +0100 |
| commit | ee1235a9a06813429c201bf186397a6feeea07bf (patch) | |
| tree | 444566605bfafce0b155a76e061a73c264329424 /fs/cifs/fscache.c | |
| parent | 402cb8dda949d9b8c0df20ad2527d139faad7ca1 (diff) | |
| download | blackbird-op-linux-ee1235a9a06813429c201bf186397a6feeea07bf.tar.gz blackbird-op-linux-ee1235a9a06813429c201bf186397a6feeea07bf.zip | |
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>
Diffstat (limited to 'fs/cifs/fscache.c')
| -rw-r--r-- | fs/cifs/fscache.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c index b89b59b01759..25d3f66b2d50 100644 --- a/fs/cifs/fscache.c +++ b/fs/cifs/fscache.c @@ -79,7 +79,7 @@ void cifs_fscache_get_client_cookie(struct TCP_Server_Info *server) &cifs_fscache_server_index_def, &key, key_len, NULL, 0, - server, true); + server, 0, true); cifs_dbg(FYI, "%s: (0x%p/0x%p)\n", __func__, server, server->fscache); } @@ -109,7 +109,7 @@ void cifs_fscache_get_super_cookie(struct cifs_tcon *tcon) &cifs_fscache_super_index_def, sharename, strlen(sharename), &tcon->resource_id, sizeof(tcon->resource_id), - tcon, true); + tcon, 0, true); kfree(sharename); cifs_dbg(FYI, "%s: (0x%p/0x%p)\n", __func__, server->fscache, tcon->fscache); @@ -137,7 +137,7 @@ static void cifs_fscache_acquire_inode_cookie(struct cifsInodeInfo *cifsi, &cifs_fscache_inode_object_def, &cifsi->uniqueid, sizeof(cifsi->uniqueid), &auxdata, sizeof(auxdata), - cifsi, true); + cifsi, cifsi->vfs_inode.i_size, true); } static void cifs_fscache_enable_inode_cookie(struct inode *inode) @@ -301,13 +301,15 @@ int __cifs_readpages_from_fscache(struct inode *inode, void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) { + struct cifsInodeInfo *cifsi = CIFS_I(inode); int ret; cifs_dbg(FYI, "%s: (fsc: %p, p: %p, i: %p)\n", - __func__, CIFS_I(inode)->fscache, page, inode); - ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL); + __func__, cifsi->fscache, page, inode); + ret = fscache_write_page(cifsi->fscache, page, + cifsi->vfs_inode.i_size, GFP_KERNEL); if (ret != 0) - fscache_uncache_page(CIFS_I(inode)->fscache, page); + fscache_uncache_page(cifsi->fscache, page); } void __cifs_fscache_readpages_cancel(struct inode *inode, struct list_head *pages) |
