diff options
| author | Daniil Lunev <d.lunev.mail@gmail.com> | 2012-09-05 20:55:01 -0500 |
|---|---|---|
| committer | Daniil Lunev <d.lunev.mail@gmail.com> | 2012-09-05 20:55:01 -0500 |
| commit | 447cd3496e676739b5cc4729773ba3cb3772dea1 (patch) | |
| tree | f96a12114f0046a35bb8ffbb3418a3d72a55b6e2 /usr/src/uts/common/fs/nfs/nfs4_srv.c | |
| parent | 21feb70aa388da939a1de2116f16a0da7c62bbf5 (diff) | |
| download | illumos-gate-447cd3496e676739b5cc4729773ba3cb3772dea1.tar.gz | |
3160 nfs: OPEN_CONFIRM with non-regular file returns wrong error
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/common/fs/nfs/nfs4_srv.c')
| -rw-r--r-- | usr/src/uts/common/fs/nfs/nfs4_srv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv.c b/usr/src/uts/common/fs/nfs/nfs4_srv.c index 3f6a824b6d..4c580087a3 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_srv.c +++ b/usr/src/uts/common/fs/nfs/nfs4_srv.c @@ -7620,6 +7620,12 @@ rfs4_op_open_confirm(nfs_argop4 *argop, nfs_resop4 *resop, goto out; } + if (cs->vp->v_type != VREG) { + *cs->statusp = resp->status = + cs->vp->v_type == VDIR ? NFS4ERR_ISDIR : NFS4ERR_INVAL; + return; + } + status = rfs4_get_state(&args->open_stateid, &sp, RFS4_DBS_VALID); if (status != NFS4_OK) { *cs->statusp = resp->status = status; |