diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 22:24:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 22:24:16 +0300 |
| commit | 7553c7e68fd144643e74a279ef51b74a15214071 (patch) | |
| tree | 5ad08f6de205a14eeba1793aa641e6b25c22b2c1 /arch/s390/hypfs/inode.c | |
| parent | 423de92f56bdfc3e68503af31e6ec041d59a6a25 (diff) | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-7553c7e68fd144643e74a279ef51b74a15214071.tar.xz | |
Merge 4.6-rc4 into char-misc-next
We want the fixes in there to build off of for other dependant patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/hypfs/inode.c')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 0f3da2cb2bd6..255c7eec4481 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -278,8 +278,8 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) sbi->uid = current_uid(); sbi->gid = current_gid(); sb->s_fs_info = sbi; - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; + sb->s_blocksize = PAGE_SIZE; + sb->s_blocksize_bits = PAGE_SHIFT; sb->s_magic = HYPFS_MAGIC; sb->s_op = &hypfs_s_ops; if (hypfs_parse_options(data, sb)) |