Commit 2dd1cb5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 74b9272b beadadfa

fs/ubifs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ static int mount_ubifs(struct ubifs_info *c) 


	ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s",

		  c->vi.ubi_num, c->vi.vol_id, c->vi.name,

		  c->ro_mount ? ", R/O mode" : NULL);

		  c->ro_mount ? ", R/O mode" : "");

	x = (long long)c->main_lebs * c->leb_size;

	y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;

	ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",