From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Bolle <pebolle@tiscali•nl>,
Boaz Harrosh <bharrosh@panasas•com>,
Al Viro <viro@ZenIV•linux.org.uk>
Subject: linux-next: manual merge of the trivial tree with the vfs tree
Date: Tue, 10 Aug 2010 12:19:00 +1000 [thread overview]
Message-ID: <20100810121900.cbceb878.sfr@canb.auug.org.au> (raw)
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;
}
next reply other threads:[~2010-08-10 2:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 2:19 Stephen Rothwell [this message]
2010-08-10 22:19 ` linux-next: manual merge of the trivial tree with the vfs tree Boaz Harrosh
2010-08-11 7:38 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100810121900.cbceb878.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bharrosh@panasas$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pebolle@tiscali$(echo .)nl \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox