|
 |
3604df |
From 35886d48bd8d9e0d591154d0ad46c2a8067aa2c1 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
Date: Fri, 18 Nov 2016 14:47:20 +0100
|
|
|
3604df |
Subject: [PATCH 187/206] gfapi/upcall: Fix mismatch in few upcall API SYMVER
|
|
|
3604df |
|
|
|
3604df |
There is mismatch in few of the upcall API routine
|
|
|
3604df |
definitions and their corresponding symbol version
|
|
|
3604df |
declarations. Fixed the same.
|
|
|
3604df |
|
|
|
3604df |
> Change-Id: I2edfd9546a4c6a9128757f3b68e3ae4edd2c7a79
|
|
|
3604df |
> BUG: 1344714
|
|
|
3604df |
> Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15760
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> (cherry picked from commit 5b453380b15f34c0841f453a02fdabc46ad2f7ef)
|
|
|
3604df |
|
|
|
3604df |
Cherry picked from commit a125687227662a37ba7d0098bf086fc10ce6ad6f:
|
|
|
3604df |
> Change-Id: Ifa57114dbe788ad71f57faccd45c1f55e86ee6ad
|
|
|
3604df |
> BUG: 1347717
|
|
|
3604df |
> Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15775
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ifa57114dbe788ad71f57faccd45c1f55e86ee6ad
|
|
|
3604df |
BUG: 1386635
|
|
|
3604df |
Signed-off-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/90580
|
|
|
3604df |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Tested-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
api/src/glfs.c | 6 +++---
|
|
|
3604df |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/api/src/glfs.c b/api/src/glfs.c
|
|
|
3604df |
index 1f394a2..ef713f9 100644
|
|
|
3604df |
--- a/api/src/glfs.c
|
|
|
3604df |
+++ b/api/src/glfs.c
|
|
|
3604df |
@@ -1395,18 +1395,18 @@ pub_glfs_upcall_inode_get_pstat (struct glfs_upcall_inode *arg)
|
|
|
3604df |
{
|
|
|
3604df |
return &arg->p_buf;
|
|
|
3604df |
}
|
|
|
3604df |
-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_get_pstat, 3.7.16);
|
|
|
3604df |
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_inode_get_pstat, 3.7.16);
|
|
|
3604df |
|
|
|
3604df |
struct glfs_object*
|
|
|
3604df |
pub_glfs_upcall_inode_get_oldpobject (struct glfs_upcall_inode *arg)
|
|
|
3604df |
{
|
|
|
3604df |
return arg->oldp_object;
|
|
|
3604df |
}
|
|
|
3604df |
-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_get_oldpobject, 3.7.16);
|
|
|
3604df |
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_inode_get_oldpobject, 3.7.16);
|
|
|
3604df |
|
|
|
3604df |
struct stat*
|
|
|
3604df |
pub_glfs_upcall_inode_get_oldpstat (struct glfs_upcall_inode *arg)
|
|
|
3604df |
{
|
|
|
3604df |
return &arg->oldp_buf;
|
|
|
3604df |
}
|
|
|
3604df |
-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_get_oldpstat, 3.7.16);
|
|
|
3604df |
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_inode_get_oldpstat, 3.7.16);
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|