Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs
Pull UBIFS fixes from Artem Bityutskiy:
- Fix crash on error which prevents emulated power-cut testing.
- Fix log reply regression introduced in 3.6-rc1.
- Fix UBIFS complaints about too small debug buffer size which.
- Fix error message spelling, and remove incorrect commentary.
* tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs:
UBIFS: fix error messages spelling
UBIFS: fix complaints about too small debug buffer size
UBIFS: fix replay regression
UBIFS: fix crash on error path
UBIFS: remove stale commentary
+7
-8
+1
-1
fs/ubifs/debug.h
+1
-1
fs/ubifs/debug.h
···
167
167
#define ubifs_dbg_msg(type, fmt, ...) \
168
168
pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__)
169
169
170
-
#define DBG_KEY_BUF_LEN 32
170
+
#define DBG_KEY_BUF_LEN 48
171
171
#define ubifs_dbg_msg_key(type, key, fmt, ...) do { \
172
172
char __tmp_key_buf[DBG_KEY_BUF_LEN]; \
173
173
pr_debug("UBIFS DBG " type ": " fmt "%s\n", ##__VA_ARGS__, \
+4
-1
fs/ubifs/lpt.c
+4
-1
fs/ubifs/lpt.c
+1
-1
fs/ubifs/recovery.c
+1
-1
fs/ubifs/recovery.c
···
788
788
789
789
corrupted_rescan:
790
790
/* Re-scan the corrupted data with verbose messages */
791
-
ubifs_err("corruptio %d", ret);
791
+
ubifs_err("corruption %d", ret);
792
792
ubifs_scan_a_node(c, buf, len, lnum, offs, 1);
793
793
corrupted:
794
794
ubifs_scanned_corruption(c, lnum, offs, buf);
+1
-2
fs/ubifs/replay.c
+1
-2
fs/ubifs/replay.c
···
1026
1026
c->replaying = 1;
1027
1027
lnum = c->ltail_lnum = c->lhead_lnum;
1028
1028
1029
-
lnum = UBIFS_LOG_LNUM;
1030
1029
do {
1031
1030
err = replay_log_leb(c, lnum, 0, c->sbuf);
1032
1031
if (err == 1)
···
1034
1035
if (err)
1035
1036
goto out;
1036
1037
lnum = ubifs_next_log_lnum(c, lnum);
1037
-
} while (lnum != UBIFS_LOG_LNUM);
1038
+
} while (lnum != c->ltail_lnum);
1038
1039
1039
1040
err = replay_buds(c);
1040
1041
if (err)
-3
fs/ubifs/super.c
-3
fs/ubifs/super.c
···
1157
1157
*
1158
1158
* This function mounts UBIFS file system. Returns zero in case of success and
1159
1159
* a negative error code in case of failure.
1160
-
*
1161
-
* Note, the function does not de-allocate resources it it fails half way
1162
-
* through, and the caller has to do this instead.
1163
1160
*/
1164
1161
static int mount_ubifs(struct ubifs_info *c)
1165
1162
{