From ade8c1ba373f004ef7fa49fa54b1a9023907328a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 20 Dec 2015 18:18:10 +0000 Subject: [PATCH] Merged revisions 6775 via svnmerge from svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r6775 | bvassche | 2015-12-20 13:46:16 +0100 (Sun, 20 Dec 2015) | 1 line scst: SLES 12 build fix ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6776 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 2a5599948..4c752e342 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -14401,7 +14401,9 @@ void scst_vfs_unlink_and_put(struct nameidata *nd) void scst_vfs_unlink_and_put(struct path *path) { #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && \ - (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7) + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7) && \ + (!defined(CONFIG_SUSE_KERNEL) || \ + LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0)) vfs_unlink(path->dentry->d_parent->d_inode, path->dentry); #else vfs_unlink(path->dentry->d_parent->d_inode, path->dentry, NULL);