diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 03:49:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 03:49:29 +0200 |
| commit | 23a3e178b9f8be3a900c7b11d795e54b4a131af0 (patch) | |
| tree | 36555d6da836a1df9918313d2a1cbefba3ca2123 /fs | |
| parent | nfs: fix anonymous member initializer build failure with older compilers (diff) | |
| parent | ubifs: ubifs_dump_inode: Fix dumping field bulk_read (diff) | |
| download | linux-23a3e178b9f8be3a900c7b11d795e54b4a131af0.tar.xz linux-23a3e178b9f8be3a900c7b11d795e54b4a131af0.zip | |
Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"This contains mostly cleanups and minor improvements of UBI and UBIFS"
* tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs:
ubifs: ubifs_dump_inode: Fix dumping field bulk_read
UBI: Fix static volume checks when Fastmap is used
UBI: Set free_count to zero before walking through erase list
UBI: Silence an unintialized variable warning
UBI: Clean up return in ubi_remove_volume()
UBI: Modify wrong comment in ubi_leb_map function.
UBI: Don't read back all data in ubi_eba_copy_leb()
UBI: Add ro-mode sysfs attribute
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 595ca0debe11..69e287e20732 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -260,7 +260,7 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode) pr_err("\txattr_names %u\n", ui->xattr_names); pr_err("\tdirty %u\n", ui->dirty); pr_err("\txattr %u\n", ui->xattr); - pr_err("\tbulk_read %u\n", ui->xattr); + pr_err("\tbulk_read %u\n", ui->bulk_read); pr_err("\tsynced_i_size %llu\n", (unsigned long long)ui->synced_i_size); pr_err("\tui_size %llu\n", |