diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 20:54:40 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-11 20:54:40 +0200 |
| commit | f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04 (patch) | |
| tree | f73da1077b7053b24a9af2d8e34b6180d5d5217e /fs/f2fs/debug.c | |
| parent | kvm: nVMX: Disallow userspace-injected exceptions in guest mode (diff) | |
| parent | KVM: s390: introduce AIS capability (diff) | |
| download | linux-f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04.tar.xz linux-f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04.zip | |
Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
From: Christian Borntraeger <borntraeger@de.ibm.com>
KVM: s390: features for 4.12
1. guarded storage support for guests
This contains an s390 base Linux feature branch that is necessary
to implement the KVM part
2. Provide an interface to implement adapter interruption suppression
which is necessary for proper zPCI support
3. Use more defines instead of numbers
4. Provide logging for lazy enablement of runtime instrumentation
Diffstat (limited to 'fs/f2fs/debug.c')
| -rw-r--r-- | fs/f2fs/debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index a77df377e2e8..ee2d0a485fc3 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -196,6 +196,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi) si->base_mem += (NM_I(sbi)->nat_bits_blocks << F2FS_BLKSIZE_BITS); si->base_mem += NM_I(sbi)->nat_blocks * NAT_ENTRY_BITMAP_SIZE; si->base_mem += NM_I(sbi)->nat_blocks / 8; + si->base_mem += NM_I(sbi)->nat_blocks * sizeof(unsigned short); get_cache: si->cache_mem = 0; |