svn commit: r282760 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Mon May 11 08:46:03 2015
New Revision: 282760
URL: https://svnweb.freebsd.org/changeset/base/282760

Log:
  MFC r282130: zfs_onexit_fd_hold: return EBADF even if devfs_get_cdevpriv gave ENOENT

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c	Mon May 11 08:43:37 2015	(r282759)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c	Mon May 11 08:46:03 2015	(r282760)
@@ -137,7 +137,7 @@ zfs_onexit_fd_hold(int fd, minor_t *mino
 		*minorp = (minor_t)(uintptr_t)data;
 	curthread->td_fpop = tmpfp;
 	if (error != 0)
-		return (error);
+		return (SET_ERROR(EBADF));
 	return (zfs_onexit_minor_to_state(*minorp, &zo));
 }