diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 09:50:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 09:50:27 -0700 |
| commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
| tree | a1142f3a5058d16504863ac777b21efdf1eca49e /fs/jffs2 | |
| parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
| parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) | |
| download | linux-d0bbe0dd353af9521e9d8bc5236308c677b6f62a.tar.gz linux-d0bbe0dd353af9521e9d8bc5236308c677b6f62a.tar.bz2 linux-d0bbe0dd353af9521e9d8bc5236308c677b6f62a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index d72817ac51f6..762c7a3cf43d 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c @@ -195,7 +195,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat /* unchecked xdatum is chained with c->xattr_unchecked */ list_del_init(&xd->xindex); - dbg_xattr("success on verfying xdatum (xid=%u, version=%u)\n", + dbg_xattr("success on verifying xdatum (xid=%u, version=%u)\n", xd->xid, xd->version); return 0; |