diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /fs/ubifs/master.c | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'fs/ubifs/master.c')
| -rw-r--r-- | fs/ubifs/master.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 71d5493bf565..a88f33801b98 100644 --- a/fs/ubifs/master.c +++ b/fs/ubifs/master.c | |||
| @@ -354,7 +354,7 @@ int ubifs_write_master(struct ubifs_info *c) | |||
| 354 | int err, lnum, offs, len; | 354 | int err, lnum, offs, len; |
| 355 | 355 | ||
| 356 | if (c->ro_media) | 356 | if (c->ro_media) |
| 357 | return -EINVAL; | 357 | return -EROFS; |
| 358 | 358 | ||
| 359 | lnum = UBIFS_MST_LNUM; | 359 | lnum = UBIFS_MST_LNUM; |
| 360 | offs = c->mst_offs + c->mst_node_alsz; | 360 | offs = c->mst_offs + c->mst_node_alsz; |