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@rasmusvillemoes.dk>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index d1338544816896dc773fc930b43dc44bcc157266..eb9d48746ab4008acc1a529c37a15ca98a00c882 100644 (file)
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2244,7 +2244,7 @@ ssize_t o2hb_heartbeat_group_mode_store(struct o2hb_heartbeat_group *group,
                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 --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 07ac24fd92520f604f6d3cfeff4cd4bd2c6ad85c..af7598bff1b51364affd08eba9cfedba8b3acf16 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -49,13 +49,13 @@ static ssize_t mlog_mask_show(u64 mask, char *buf)
 
 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