diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-05 12:08:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-05 12:08:47 -0700 |
| commit | 2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647 (patch) | |
| tree | 827eb1daa5055d56762709848b9a2ddf617b7884 /fs | |
| parent | 74b9272bbedf45cb01a048217830d64d59aaa73b (diff) | |
| parent | beadadfa5467e09e36891f39cae1f5d8d3bbf17e (diff) | |
| download | op-kernel-dev-2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647.zip op-kernel-dev-2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647.tar.gz | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index f21acf0..879b997 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -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", |
