From: Jean Delvare <khali@linux-fr.org>
To: trivial@kernel.org, LKML <linux-kernel@vger.kernel.org>
Cc: Tyler Hicks <tyhicks@linux.vnet.ibm.com>,
Dustin Kirkland <kirkland@canonical.com>,
David Woodhouse <dwmw2@infradead.org>,
Alex Elder <aelder@sgi.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] fs: Merge split strings
Date: Sat, 16 Jul 2011 18:10:35 +0200 [thread overview]
Message-ID: <20110716181035.7db8d8f0@endymion.delvare> (raw)
No idea why these were split in the first place...
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
fs/ecryptfs/keystore.c | 2 +-
fs/jffs2/readinode.c | 2 +-
fs/xfs/xfs_dir2_node.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- linux-3.0-rc5.orig/fs/ecryptfs/keystore.c 2011-05-30 20:45:21.000000000 +0200
+++ linux-3.0-rc5/fs/ecryptfs/keystore.c 2011-07-04 13:16:53.000000000 +0200
@@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *r
auth_tok->token.password.session_key_encryption_key,
crypt_stat->key_size);
ecryptfs_printk(KERN_DEBUG,
- "Cached session key " "encryption key: \n");
+ "Cached session key encryption key:\n");
if (ecryptfs_verbosity > 0)
ecryptfs_dump_hex(session_key_encryption_key, 16);
}
--- linux-3.0-rc5.orig/fs/jffs2/readinode.c 2011-05-20 10:42:43.000000000 +0200
+++ linux-3.0-rc5/fs/jffs2/readinode.c 2011-07-04 13:19:26.000000000 +0200
@@ -1041,7 +1041,7 @@ static int jffs2_get_inode_nodes(struct
/* FIXME: point() */
err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf);
if (err) {
- JFFS2_ERROR("can not read %d bytes from 0x%08x, " "error code: %d.\n", len, ref_offset(ref), err);
+ JFFS2_ERROR("can not read %d bytes from 0x%08x, error code: %d.\n", len, ref_offset(ref), err);
goto free_out;
}
--- linux-3.0-rc5.orig/fs/xfs/xfs_dir2_node.c 2011-05-20 10:42:44.000000000 +0200
+++ linux-3.0-rc5/fs/xfs/xfs_dir2_node.c 2011-07-04 13:19:58.000000000 +0200
@@ -1641,7 +1641,7 @@ xfs_dir2_node_addname_int(
if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) {
xfs_alert(mp,
- "%s: dir ino " "%llu needed freesp block %lld for\n"
+ "%s: dir ino %llu needed freesp block %lld for\n"
" data block %lld, got %lld ifbno %llu lastfbno %d",
__func__, (unsigned long long)dp->i_ino,
(long long)xfs_dir2_db_to_fdb(mp, dbno),
--
Jean Delvare
next reply other threads:[~2011-07-16 16:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 16:10 Jean Delvare [this message]
2011-07-22 14:47 ` 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=20110716181035.7db8d8f0@endymion.delvare \
--to=khali@linux-fr.org \
--cc=aelder@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=dwmw2@infradead.org \
--cc=kirkland@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=trivial@kernel.org \
--cc=tyhicks@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®