The patch titled Subject: ocfs2: replace strnicmp with strncasecmp has been added to the -mm tree. Its filename is ocfs2-replace-strnicmp-with-strncasecmp.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-replace-strnicmp-with-strncasecmp.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-replace-strnicmp-with-strncasecmp.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: ocfs2: replace strnicmp with strncasecmp The kernel used to contain two functions for length-delimited, case-insensitive string comparison, strnicmp with correct semantics and a slightly buggy strncasecmp. The latter is the POSIX name, so strnicmp was renamed to strncasecmp, and strnicmp made into a wrapper for the new strncasecmp to avoid breaking existing users. To allow the compat wrapper strnicmp to be removed at some point in the future, and to avoid the extra indirection cost, do s/strnicmp/strncasecmp/g. Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/ocfs2/cluster/masklog.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN fs/ocfs2/cluster/heartbeat.c~ocfs2-replace-strnicmp-with-strncasecmp fs/ocfs2/cluster/heartbeat.c --- a/fs/ocfs2/cluster/heartbeat.c~ocfs2-replace-strnicmp-with-strncasecmp +++ a/fs/ocfs2/cluster/heartbeat.c @@ -2244,7 +2244,7 @@ ssize_t o2hb_heartbeat_group_mode_store( return -EINVAL; for (i = 0; i < O2HB_HEARTBEAT_NUM_MODES; ++i) { - if (strnicmp(page, o2hb_heartbeat_mode_desc[i], len)) + if (strncasecmp(page, o2hb_heartbeat_mode_desc[i], len)) continue; ret = o2hb_global_heartbeat_mode_set(i); diff -puN fs/ocfs2/cluster/masklog.c~ocfs2-replace-strnicmp-with-strncasecmp fs/ocfs2/cluster/masklog.c --- a/fs/ocfs2/cluster/masklog.c~ocfs2-replace-strnicmp-with-strncasecmp +++ a/fs/ocfs2/cluster/masklog.c @@ -49,13 +49,13 @@ static ssize_t mlog_mask_show(u64 mask, static ssize_t mlog_mask_store(u64 mask, const char *buf, size_t count) { - if (!strnicmp(buf, "allow", 5)) { + if (!strncasecmp(buf, "allow", 5)) { __mlog_set_u64(mask, mlog_and_bits); __mlog_clear_u64(mask, mlog_not_bits); - } else if (!strnicmp(buf, "deny", 4)) { + } else if (!strncasecmp(buf, "deny", 4)) { __mlog_set_u64(mask, mlog_not_bits); __mlog_clear_u64(mask, mlog_and_bits); - } else if (!strnicmp(buf, "off", 3)) { + } else if (!strncasecmp(buf, "off", 3)) { __mlog_clear_u64(mask, mlog_not_bits); __mlog_clear_u64(mask, mlog_and_bits); } else _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are linux-next.patch lib-string-remove-duplicated-function.patch lib-string-make-all-calls-to-strnicmp-into-calls-to-strncasecmp.patch arm-replace-strnicmp-with-strncasecmp.patch block-replace-strnicmp-with-strncasecmp.patch netfilter-replace-strnicmp-with-strncasecmp.patch video-fbdev-replace-strnicmp-with-strncasecmp.patch cifs-replace-strnicmp-with-strncasecmp.patch ocfs2-replace-strnicmp-with-strncasecmp.patch isofs-replace-strnicmp-with-strncasecmp.patch batman-adv-replace-strnicmp-with-strncasecmp.patch acpi-battery-replace-strnicmp-with-strncasecmp.patch cpufreq-replace-strnicmp-with-strncasecmp.patch cpuidle-replace-strnicmp-with-strncasecmp.patch scsi-replace-strnicmp-with-strncasecmp.patch ib_srpt-replace-strnicmp-with-strncasecmp.patch input-edt-ft5x06-replace-strnicmp-with-strncasecmp.patch altera-stapl-replace-strnicmp-with-strncasecmp.patch thinkpad_acpi-replace-strnicmp-with-strncasecmp.patch pnp-replace-strnicmp-with-strncasecmp.patch s390-cio-replace-strnicmp-with-strncasecmp.patch staging-r8188eu-replace-strnicmp-with-strncasecmp.patch thermal-replace-strnicmp-with-strncasecmp.patch kdb-replace-strnicmp-with-strncasecmp.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html