Page MenuHomeFreeBSD
Files F154087961

D2382.id5046.diff
No OneTemporary
Actions

D2382.id5046.diff
View Options

Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -4196,7 +4196,11 @@
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 @@
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 @@
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 @@
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 @@
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));

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 27, 2:00 AM (4 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32204135
Default Alt Text
D2382.id5046.diff (1 KB)

Event Timeline