Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull ubifs fix from Artem Bityutskiy:
"Only a single patch which fixes a message"

* tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs:
UBIFS: correct mount message

Linus Torvalds 12 years ago 2dd1cb5a 74b9272b

+1 -1

1 changed file

expand all

ubifs

super.c

+1 -1

fs/ubifs/super.c

··· 1412 1412 1413 1413 ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s", 1414 1414 c->vi.ubi_num, c->vi.vol_id, c->vi.name, 1415 - c->ro_mount ? ", R/O mode" : NULL); 1415 + c->ro_mount ? ", R/O mode" : ""); 1416 1416 x = (long long)c->main_lebs * c->leb_size; 1417 1417 y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes; 1418 1418 ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",