diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /fs/inode.c | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 (diff) | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d (diff) | |
| download | linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.gz linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.bz2 linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/inode.c b/fs/inode.c index 13ceb98c3bd3..3b55391072f3 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -178,6 +178,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) mapping->a_ops = &empty_aops; mapping->host = inode; mapping->flags = 0; + mapping->wb_err = 0; atomic_set(&mapping->i_mmap_writable, 0); mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); mapping->private_data = NULL; |