| zfs_ioctl.c (235222) | zfs_ioctl.c (236155) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 23 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 24 * All rights reserved. 25 * Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> 26 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 23 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 24 * All rights reserved. 25 * Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> 26 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. |
| 27 * Copyright (c) 2011 by Delphix. All rights reserved. | 27 * Copyright (c) 2012 by Delphix. All rights reserved. |
| 28 * Copyright (c) 2012, Joyent, Inc. All rights reserved. 29 */ 30 31#include <sys/types.h> 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/conf.h> 35#include <sys/kernel.h> --- 4084 unchanged lines hidden (view full) --- 4120 if (zio_resume(spa) != 0) 4121 error = EIO; 4122 4123 spa_close(spa, FTAG); 4124 4125 return (error); 4126} 4127 | 28 * Copyright (c) 2012, Joyent, Inc. All rights reserved. 29 */ 30 31#include <sys/types.h> 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/conf.h> 35#include <sys/kernel.h> --- 4084 unchanged lines hidden (view full) --- 4120 if (zio_resume(spa) != 0) 4121 error = EIO; 4122 4123 spa_close(spa, FTAG); 4124 4125 return (error); 4126} 4127 |
| 4128static int 4129zfs_ioc_pool_reopen(zfs_cmd_t *zc) 4130{ 4131 spa_t *spa; 4132 int error; 4133 4134 error = spa_open(zc->zc_name, &spa, FTAG); 4135 if (error) 4136 return (error); 4137 4138 spa_vdev_state_enter(spa, SCL_NONE); 4139 vdev_reopen(spa->spa_root_vdev); 4140 (void) spa_vdev_state_exit(spa, NULL, 0); 4141 spa_close(spa, FTAG); 4142 return (0); 4143} |
|
| 4128/* 4129 * inputs: 4130 * zc_name name of filesystem 4131 * zc_value name of origin snapshot 4132 * 4133 * outputs: 4134 * zc_string name of conflicting snapshot, if there is one 4135 */ --- 853 unchanged lines hidden (view full) --- 4989 { zfs_ioc_unjail, zfs_secpolicy_config, DATASET_NAME, B_TRUE, B_FALSE }, 4990 { zfs_ioc_pool_reguid, zfs_secpolicy_config, POOL_NAME, B_TRUE, 4991 B_TRUE }, 4992 { zfs_ioc_space_written, zfs_secpolicy_read, DATASET_NAME, B_FALSE, 4993 B_TRUE }, 4994 { zfs_ioc_space_snaps, zfs_secpolicy_read, DATASET_NAME, B_FALSE, 4995 B_TRUE }, 4996 { zfs_ioc_send_progress, zfs_secpolicy_read, DATASET_NAME, B_FALSE, | 4144/* 4145 * inputs: 4146 * zc_name name of filesystem 4147 * zc_value name of origin snapshot 4148 * 4149 * outputs: 4150 * zc_string name of conflicting snapshot, if there is one 4151 */ --- 853 unchanged lines hidden (view full) --- 5005 { zfs_ioc_unjail, zfs_secpolicy_config, DATASET_NAME, B_TRUE, B_FALSE }, 5006 { zfs_ioc_pool_reguid, zfs_secpolicy_config, POOL_NAME, B_TRUE, 5007 B_TRUE }, 5008 { zfs_ioc_space_written, zfs_secpolicy_read, DATASET_NAME, B_FALSE, 5009 B_TRUE }, 5010 { zfs_ioc_space_snaps, zfs_secpolicy_read, DATASET_NAME, B_FALSE, 5011 B_TRUE }, 5012 { zfs_ioc_send_progress, zfs_secpolicy_read, DATASET_NAME, B_FALSE, |
| 4997 B_FALSE } | 5013 B_FALSE }, 5014 { zfs_ioc_pool_reopen, zfs_secpolicy_config, POOL_NAME, B_TRUE, 5015 B_TRUE }, |
| 4998}; 4999 5000int 5001pool_status_check(const char *name, zfs_ioc_namecheck_t type) 5002{ 5003 spa_t *spa; 5004 int error; 5005 --- 469 unchanged lines hidden --- | 5016}; 5017 5018int 5019pool_status_check(const char *name, zfs_ioc_namecheck_t type) 5020{ 5021 spa_t *spa; 5022 int error; 5023 --- 469 unchanged lines hidden --- |