From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, Oleg Drokin <oleg.drokin@intel.com>,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
lustre-devel@lists.lustre.org, Fan Yong <fan.yong@intel.com>
Subject: [PATCH] staging: lustre: add libcfs version of cfs_strrstr
Date: Sun, 8 Nov 2015 11:35:00 -0500 [thread overview]
Message-ID: <1447000500-29427-7-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1447000500-29427-1-git-send-email-jsimmons@infradead.org>
From: Fan Yong <fan.yong@intel.com>
Create a kernel side function that does the same
thing as userland strrstr. This is from patch
http://review.whamcloud.com/7666.
Signed-off-by: Fan Yong <fan.yong@intel.com>
ntel-bug-id: https://jira.hpdd.intel.com/browse/LU-3951
Reviewed-on: http://review.whamcloud.com/7666
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
.../lustre/include/linux/libcfs/libcfs_string.h | 1 +
.../staging/lustre/lustre/libcfs/libcfs_string.c | 27 ++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
index d8d2e7d..052f684 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
@@ -44,6 +44,7 @@
#define __LIBCFS_STRING_H__
/* libcfs_string.c */
+char *cfs_strrstr(const char *haystack, const char *needle);
/* string comparison ignoring case */
int cfs_strncasecmp(const char *s1, const char *s2, size_t n);
/* Convert a text string to a bitmask */
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
index 05630f8..4e399ef 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@@ -42,6 +42,33 @@
#include "../../include/linux/libcfs/libcfs.h"
+char *cfs_strrstr(const char *haystack, const char *needle)
+{
+ char *ptr;
+
+ if (unlikely(!haystack || !needle))
+ return NULL;
+
+ if (strlen(needle) == 1)
+ return strrchr(haystack, needle[0]);
+
+ ptr = strstr(haystack, needle);
+ if (ptr) {
+ while (1) {
+ char *tmp;
+
+ tmp = strstr(&ptr[1], needle);
+ if (!tmp)
+ return ptr;
+
+ ptr = tmp;
+ }
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL(cfs_strrstr);
+
/* Convert a text string to a bitmask */
int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
int *oldmask, int minmask, int allmask)
--
1.7.1
prev parent reply other threads:[~2015-11-08 16:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-08 16:34 [PATCH v2] staging: lustre: remove IOC_LIBCFS_PING_TEST ioctl James Simmons
2015-11-08 16:34 ` [PATCH] staging: lustre: Handle nodemask on UMP machines James Simmons
2015-11-09 11:19 ` Sudip Mukherjee
2015-11-10 0:46 ` [lustre-devel] " Simmons, James A.
2015-12-21 22:08 ` Greg Kroah-Hartman
2015-12-22 0:30 ` [lustre-devel] " Dilger, Andreas
2015-11-08 16:34 ` [PATCH] staging: lustre: add sparse locking annotations James Simmons
2015-11-08 16:34 ` [PATCH] staging: lustre: added debugging ability for LFSCK James Simmons
2015-11-08 16:34 ` [PATCH] staging: lustre: enum lu_object_header_flags comma style fix James Simmons
2015-11-08 16:34 ` [PATCH] staging: lustre: export cfs_str2mask James Simmons
2015-11-09 11:08 ` [lustre-devel] " Drokin, Oleg
2015-11-10 0:44 ` Simmons, James A.
2015-12-21 22:05 ` Greg Kroah-Hartman
2015-11-08 16:35 ` James Simmons [this message]
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=1447000500-29427-7-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=fan.yong@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.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®