Messages in this thread | | | Date | Tue, 10 Aug 2010 12:19:00 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the vfs tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in fs/exofs/inode.c between commit 21883a7d05d4c1e97943fa1a587aa2c2a3b09e8c ("exofs: New truncate sequence") from the vfs tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix printk typo 'faild'") from the trivial tree.
Just context changes. I fixed it up (see below) and can carry it for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/exofs/inode.c index eb7368e,5862ae8..0000000 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c @@@ -713,8 -709,8 +713,8 @@@ int exofs_write_begin(struct file *file ret = simple_write_begin(file, mapping, pos, len, flags, pagep, fsdata); if (ret) { - EXOFS_DBGMSG("simple_write_begin faild\n"); + EXOFS_DBGMSG("simple_write_begin failed\n"); - return ret; + goto out; } page = *pagep; @@@ -726,12 -722,9 +726,12 @@@ if (ret) { /*SetPageError was done by _readpage. Is it ok?*/ unlock_page(page); - EXOFS_DBGMSG("__readpage_filler faild\n"); + EXOFS_DBGMSG("__readpage_filler failed\n"); } } +out: + if (unlikely(ret)) + _write_failed(mapping->host, pos + len); return ret; }
| |