Author: avg
Date: Fri Jun 5 15:51:23 2015
New Revision: 284026
URL: https://svnweb.freebsd.org/changeset/base/284026
Log:
MFC r282766: zfs ioctls: use fget_write / fget_read instead of getf wrapper
for fget
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Fri Jun 5 15:32:04 2015 (r284025)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Fri Jun 5 15:51:23 2015 (r284026)
@@ -4196,7 +4196,11 @@ zfs_ioc_recv(zfs_cmd_t *zc)
return (error);
fd = zc->zc_cookie;
- fp = getf(fd, cap_rights_init(&rights, CAP_PREAD));
+#ifdef illumos
+ fp = getf(fd);
+#else
+ fget_read(curthread, fd, cap_rights_init(&rights, CAP_PREAD), &fp);
+#endif
if (fp == NULL) {
nvlist_free(props);
return (SET_ERROR(EBADF));
@@ -4442,8 +4446,12 @@ zfs_ioc_send(zfs_cmd_t *zc)
file_t *fp;
cap_rights_t rights;
- fp = getf(zc->zc_cookie,
- cap_rights_init(&rights, CAP_WRITE));
+#ifdef illumos
+ fp = getf(zc->zc_cookie);
+#else
+ fget_write(curthread, zc->zc_cookie,
+ cap_rights_init(&rights, CAP_WRITE), &fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5039,7 +5047,12 @@ zfs_ioc_diff(zfs_cmd_t *zc)
offset_t off;
int error;
- fp = getf(zc->zc_cookie, cap_rights_init(&rights, CAP_WRITE));
+#ifdef illumos
+ fp = getf(zc->zc_cookie);
+#else
+ fget_write(curthread, zc->zc_cookie,
+ cap_rights_init(&rights, CAP_WRITE), &fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5404,6 +5417,7 @@ static int
zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
{
cap_rights_t rights;
+ file_t *fp;
int error;
offset_t off;
char *fromname = NULL;
@@ -5420,7 +5434,11 @@ zfs_ioc_send_new(const char *snapname, n
largeblockok = nvlist_exists(innvl, "largeblockok");
embedok = nvlist_exists(innvl, "embedok");
- file_t *fp = getf(fd, cap_rights_init(&rights, CAP_READ));
+#ifdef illumos
+ file_t *fp = getf(fd);
+#else
+ fget_write(curthread, fd, cap_rights_init(&rights, CAP_WRITE), &fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
