diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-28 19:31:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-28 19:31:33 -0700 |
| commit | c95389b4cd6a4b52af78bea706a274453e886251 (patch) | |
| tree | 01e0046bdef0121e57ebecbead1d757494dcbd13 /fs | |
| parent | 98474236f72e5a8b89c14cd7c74f0bb77a4b1a99 (diff) | |
| parent | 49fa8140e487b492da24c76ac3cccad0a0ae63e4 (diff) | |
| download | op-kernel-dev-c95389b4cd6a4b52af78bea706a274453e886251.zip op-kernel-dev-c95389b4cd6a4b52af78bea706a274453e886251.tar.gz | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge fixes from Andrew Morton:
"Five fixes.
err, make that six. let me try again"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers
memcg: check that kmem_cache has memcg_params before accessing it
drivers/base/memory.c: fix show_mem_removable() to handle missing sections
IPC: bugfix for msgrcv with msgtyp < 0
Omnikey Cardman 4000: pull in ioctl.h in user header
timer_list: correct the iterator for timer_list
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 854d809..121da2d 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1022,7 +1022,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) struct inode *inode = NULL; struct ocfs2_super *osb = NULL; struct buffer_head *bh = NULL; - char nodestr[8]; + char nodestr[12]; struct ocfs2_blockcheck_stats stats; trace_ocfs2_fill_super(sb, data, silent); |
