summaryrefslogtreecommitdiffstats
path: root/xlators/nfs
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-06-23 00:03:05 +0200
committerNiels de Vos <ndevos@redhat.com>2015-06-28 15:33:43 -0700
commit381afd4f480533f212e1f62a0ccfd9dcf7248e17 (patch)
tree3664584f9102df24dfdf8457708af25c81fbcdd2 /xlators/nfs
parent7b51bd636fc5e5e1ae48a4e7cba48d0d20878d15 (diff)
nfs: a unix-domain-socket should not be created as fifo
Change-Id: Ic6a23165df1703b330636a059967c3c674dbde57 BUG: 1235231 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/11355 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/nfs')
-rw-r--r--xlators/nfs/server/src/nfs3.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index a239d289d13..b4f95cae993 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -3153,7 +3153,7 @@ rpcerr:
}
-int
+static int
nfs3_mknod_reply (rpcsvc_request_t *req, nfsstat3 stat, struct nfs3_fh *fh,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
@@ -3249,7 +3249,7 @@ nfs3err:
}
-int
+static int
nfs3_mknod_device (nfs3_call_state_t *cs)
{
int ret = -EFAULT;
@@ -3280,12 +3280,11 @@ nfs3_mknod_device (nfs3_call_state_t *cs)
}
-int
-nfs3_mknod_fifo (nfs3_call_state_t *cs)
+static int
+nfs3_mknod_fifo (nfs3_call_state_t *cs, mode_t mode)
{
int ret = -EFAULT;
nfs_user_t nfu = {0, };
- mode_t mode = S_IFIFO;
if (!cs)
return ret;
@@ -3304,7 +3303,7 @@ nfs3_mknod_fifo (nfs3_call_state_t *cs)
}
-int
+static int
nfs3_mknod_resume (void *carg)
{
nfsstat3 stat = NFS3ERR_SERVERFAULT;
@@ -3323,8 +3322,10 @@ nfs3_mknod_resume (void *carg)
ret = nfs3_mknod_device (cs);
break;
case NF3SOCK:
+ ret = nfs3_mknod_fifo (cs, S_IFSOCK);
+ break;
case NF3FIFO:
- ret = nfs3_mknod_fifo (cs);
+ ret = nfs3_mknod_fifo (cs, S_IFIFO);
break;
default:
ret = -EBADF;