diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-07-17 09:51:16 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-07-23 09:01:45 -0700 |
| commit | 2815a8c778fb6c17c6dfe908a82e840687c29a98 (patch) | |
| tree | 98b634b98b7d8932fbf52e45f713231bd10e0b30 /xlators/nfs | |
| parent | 07eefaa6a51771a31343f031568e80b55f1f16c1 (diff) | |
nfs: a unix-domain-socket should not be created as fifo
Cherry picked from commit 381afd4f480533f212e1f62a0ccfd9dcf7248e17:
> 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>
Change-Id: Ic6a23165df1703b330636a059967c3c674dbde57
BUG: 1244114
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/11708
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/nfs')
| -rw-r--r-- | xlators/nfs/server/src/nfs3.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index d66ac5d00b5..234e11408ef 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -3158,7 +3158,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) @@ -3254,7 +3254,7 @@ nfs3err: } -int +static int nfs3_mknod_device (nfs3_call_state_t *cs) { int ret = -EFAULT; @@ -3285,12 +3285,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; @@ -3309,7 +3308,7 @@ nfs3_mknod_fifo (nfs3_call_state_t *cs) } -int +static int nfs3_mknod_resume (void *carg) { nfsstat3 stat = NFS3ERR_SERVERFAULT; @@ -3328,8 +3327,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; |