From e01d03fe2fb89d5b619e466aa11451ca52eb1ebf Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Jun 2015 04:18:47 +0000 Subject: [PATCH 1/2] scripts/specialize-patch: Recognize identifiers correctly git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6237 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/specialize-patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/specialize-patch b/scripts/specialize-patch index b10179c6b..aee6563e8 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -215,19 +215,19 @@ function evaluate(stmnt, pattern, arg, op, result) { sub(pattern, (op[1] != 0) && (op[2] != 0), stmnt) } - pattern="^+#if[[:blank:]]*([01])[[:blank:]]*\\&\\&[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z_]*[[:blank:]]*\\))$" + pattern="^+#if[[:blank:]]*([01])[[:blank:]]*\\&\\&[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z0-9_]*[[:blank:]]*\\))$" while (match(stmnt, pattern, op) != 0) { stmnt = "+#if " (op[1] != 0 ? op[2] : op[1]) } - pattern="^+#if[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z_]*[[:blank:]]*\\))\\&\\&[[:blank:]]*([01])[[:blank:]]*$" + pattern="^+#if[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z0-9_]*[[:blank:]]*\\))\\&\\&[[:blank:]]*([01])[[:blank:]]*$" while (match(stmnt, pattern, op) != 0) { stmnt = "+#if " (op[2] != 0 ? op[1] : op[2]) } - pattern="^+#if[[:blank:]]*(!*[[:blank:]]*[A-Za-z_]*)[[:blank:]]*\\&\\&[[:blank:]]*([01])[[:blank:]]*$" + pattern="^+#if[[:blank:]]*(!*[[:blank:]]*[A-Za-z0-9_]*)[[:blank:]]*\\&\\&[[:blank:]]*([01])[[:blank:]]*$" while (match(stmnt, pattern, op) != 0) { stmnt = "+#if " (op[2] != 0 ? op[1] : op[2]) @@ -239,13 +239,13 @@ function evaluate(stmnt, pattern, arg, op, result) { sub(pattern, (op[1] != 0) || (op[2] != 0), stmnt) } - pattern="^+#if[[:blank:]]*([01])[[:blank:]]*\\|\\|[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z_]*[[:blank:]]*\\))$" + pattern="^+#if[[:blank:]]*([01])[[:blank:]]*\\|\\|[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z0-9_]*[[:blank:]]*\\))$" while (match(stmnt, pattern, op) != 0) { stmnt = "+#if " (op[1] == 0 ? op[2] : op[1]) } - pattern="\\(([01])[[:blank:]]*\\|\\|[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z_]*[[:blank:]]*\\))\\)" + pattern="\\(([01])[[:blank:]]*\\|\\|[[:blank:]]*(!*[[:blank:]]*defined[[:blank:]]*\\([[:blank:]]*[A-Za-z0-9_]*[[:blank:]]*\\))\\)" while (match(stmnt, pattern, op) != 0) { sub(pattern, op[1] == 0 ? op[2] : op[1], stmnt) From b7ec40e6a7bd9d4075880c859bd479c2392066bb Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Jun 2015 04:19:47 +0000 Subject: [PATCH 2/2] scst: RHEL 5 build fix for file_inode() git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6238 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 8f7d497be..975463def 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -282,11 +282,12 @@ static inline void hex2bin(u8 *dst, const char *src, size_t count) !defined(CONFIG_COMPAT_KERNEL_3_12) /* * See also patch "new helper: file_inode(file)" (commit ID - * 496ad9aa8ef448058e36ca7a787c61f2e63f0f54). + * 496ad9aa8ef448058e36ca7a787c61f2e63f0f54). See also patch + * "kill f_dentry macro" (commit ID 78d28e651f97). */ static inline struct inode *file_inode(const struct file *f) { - return f->f_path.dentry->d_inode; + return f->f_dentry->d_inode; } #endif