summaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/namei.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2015-11-04 16:20:34 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2015-11-11 08:08:17 +0100
commit95201a40604791bc4a2e8d066429be89fb82b46d (patch)
treeef88b895c4e6b8bef8efd28d9ea852cb63814dc7 /fs/cachefiles/namei.c
parentFS-Cache: Don't override netfs's primary_index if registering failed (diff)
downloadlinux-95201a40604791bc4a2e8d066429be89fb82b46d.tar.xz
linux-95201a40604791bc4a2e8d066429be89fb82b46d.zip
cachefiles: perform test on s_blocksize when opening cache file.
cachefiles requires that s_blocksize in the cache is not greater than PAGE_SIZE, and performs the check every time a block is accessed. Move the test to the place where the file is "opened", where other file-validity tests are performed. Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cachefiles/namei.c')
-rw-r--r--fs/cachefiles/namei.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index fc1056f5c96a..c4b893453e0e 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -655,6 +655,8 @@ lookup_again:
aops = d_backing_inode(object->dentry)->i_mapping->a_ops;
if (!aops->bmap)
goto check_error;
+ if (object->dentry->d_sb->s_blocksize > PAGE_SIZE)
+ goto check_error;
object->backer = object->dentry;
} else {