mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

RHEL 7 build fixes (merge r5543 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5544 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-05-23 07:36:50 +00:00
parent 0802e338bb
commit 2703ade89c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iscsi-scst/kernel/conn.c
View File

@@ -167,7 +167,8 @@ static ssize_t iscsi_get_initiator_ip(struct iscsi_conn *conn,
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
NIP6(inet6_sk(sk)->daddr));
#else
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
pos = scnprintf(buf, size, "[%p6]", &inet6_sk(sk)->daddr);
#else
pos = scnprintf(buf, size, "[%p6]", &sk->sk_v6_daddr);

3
scst/src/scst_pres.c
View File

@@ -586,7 +586,8 @@ static inline void scst_pr_vfs_unlink_and_put(struct nameidata *nd)
#else
static inline void scst_pr_vfs_unlink_and_put(struct path *path)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
vfs_unlink(path->dentry->d_parent->d_inode, path->dentry);
#else
vfs_unlink(path->dentry->d_parent->d_inode, path->dentry, NULL);