summaryrefslogtreecommitdiff
path: root/ipc/mqueue.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-05 09:41:36 +0300
committerIngo Molnar <mingo@kernel.org>2016-05-05 09:41:36 +0300
commitf3391a160b22f8e006f3fb8ef39aa01da749fbf0 (patch)
tree9a8f61fe1a3dd0d12e7511567b2344f80f5aa531 /ipc/mqueue.c
parentd7847a7017b2a2759dd5590c0cffdbdf2994918e (diff)
parent04974df8049fc4240d22759a91e035082ccd18b4 (diff)
downloadlinux-f3391a160b22f8e006f3fb8ef39aa01da749fbf0.tar.xz
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r--ipc/mqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 781c1399c6a3..ade739f67f1d 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -307,8 +307,8 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent)
struct inode *inode;
struct ipc_namespace *ns = data;
- 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 = MQUEUE_MAGIC;
sb->s_op = &mqueue_super_ops;