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
This commit is contained in:
Bart Van Assche
2015-12-20 18:18:10 +00:00
parent d0ce0fc67f
commit ade8c1ba37

View File

@@ -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);