aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/interface.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-11-19 13:11:52 -0500
committerDavid Howells <dhowells@redhat.com>2009-11-19 13:11:52 -0500
commita17754fb8c28af19cd70dcbec6d5b0773b94e0c1 (patch)
treed7c25b217c684153eadbac78ab9b1bbff08b75f6 /fs/cachefiles/interface.c
parent868411be3f445a83fafbd734f3e426400138add5 (diff)
CacheFiles: Don't write a full page if there's only a partial page to cache
cachefiles_write_page() writes a full page to the backing file for the last page of the netfs file, even if the netfs file's last page is only a partial page. This causes the EOF on the backing file to be extended beyond the EOF of the netfs, and thus the backing file will be truncated by cachefiles_attr_changed() called from cachefiles_lookup_object(). So we need to limit the write we make to the backing file on that last page such that it doesn't push the EOF too far. Also, if a backing file that has a partial page at the end is expanded, we discard the partial page and refetch it on the basis that we then have a hole in the file with invalid data, and should the power go out... A better way to deal with this could be to record a note that the partial page contains invalid data until the correct data is written into it. This isn't a problem for netfs's that discard the whole backing file if the file size changes (such as NFS). Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/cachefiles/interface.c')
-rw-r--r--fs/cachefiles/interface.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index dd7f852746cb..8e67abf05985 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -404,12 +404,26 @@ static int cachefiles_attr_changed(struct fscache_object *_object)
404 if (oi_size == ni_size) 404 if (oi_size == ni_size)
405 return 0; 405 return 0;
406 406
407 newattrs.ia_size = ni_size;
408 newattrs.ia_valid = ATTR_SIZE;
409
410 cachefiles_begin_secure(cache, &saved_cred); 407 cachefiles_begin_secure(cache, &saved_cred);
411 mutex_lock(&object->backer->d_inode->i_mutex); 408 mutex_lock(&object->backer->d_inode->i_mutex);
409
410 /* if there's an extension to a partial page at the end of the backing
411 * file, we need to discard the partial page so that we pick up new
412 * data after it */
413 if (oi_size & ~PAGE_MASK && ni_size > oi_size) {
414 _debug("discard tail %llx", oi_size);
415 newattrs.ia_valid = ATTR_SIZE;
416 newattrs.ia_size = oi_size & PAGE_MASK;
417 ret = notify_change(object->backer, &newattrs);
418 if (ret < 0)
419 goto truncate_failed;
420 }
421
422 newattrs.ia_valid = ATTR_SIZE;
423 newattrs.ia_size = ni_size;
412 ret = notify_change(object->backer, &newattrs); 424 ret = notify_change(object->backer, &newattrs);
425
426truncate_failed:
413 mutex_unlock(&object->backer->d_inode->i_mutex); 427 mutex_unlock(&object->backer->d_inode->i_mutex);
414 cachefiles_end_secure(cache, saved_cred); 428 cachefiles_end_secure(cache, saved_cred);
415 429