mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-17 01:51:00 +03:00
6f1ffb0665
2882 implement libzfs_core 2883 changing "canmount" property to "on" should not always remount dataset 2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Chris Siden <christopher.siden@delphix.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Bill Pijewski <wdp@joyent.com> Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com> Approved by: Eric Schrock <Eric.Schrock@delphix.com> References: https://www.illumos.org/issues/2882 https://www.illumos.org/issues/2883 https://www.illumos.org/issues/2900 illumos/illumos-gate@4445fffbbb Ported-by: Tim Chase <tim@chase2k.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1293 Porting notes: WARNING: This patch changes the user/kernel ABI. That means that the zfs/zpool utilities built from master are NOT compatible with the 0.6.2 kernel modules. Ensure you load the matching kernel modules from master after updating the utilities. Otherwise the zfs/zpool commands will be unable to interact with your pool and you will see errors similar to the following: $ zpool list failed to read pool configuration: bad address no pools available $ zfs list no datasets available Add zvol minor device creation to the new zfs_snapshot_nvl function. Remove the logging of the "release" operation in dsl_dataset_user_release_sync(). The logging caused a null dereference because ds->ds_dir is zeroed in dsl_dataset_destroy_sync() and the logging functions try to get the ds name via the dsl_dataset_name() function. I've got no idea why this particular code would have worked in Illumos. This code has subsequently been completely reworked in Illumos commit 3b2aab1 (3464 zfs synctask code needs restructuring). Squash some "may be used uninitialized" warning/erorrs. Fix some printf format warnings for %lld and %llu. Apply a few spa_writeable() changes that were made to Illumos in illumos/illumos-gate.git@cd1c8b8 as part of the 3112, 3113, 3114 and 3115 fixes. Add a missing call to fnvlist_free(nvl) in log_internal() that was added in Illumos to fix issue 3085 but couldn't be ported to ZoL at the time (zfsonlinux/zfs@9e11c73) because it depended on future work.
85 lines
2.4 KiB
C
85 lines
2.4 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*/
|
|
/*
|
|
* Copyright (c) 2012 by Delphix. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _SYS_RR_RW_LOCK_H
|
|
#define _SYS_RR_RW_LOCK_H
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <sys/inttypes.h>
|
|
#include <sys/zfs_context.h>
|
|
#include <sys/refcount.h>
|
|
|
|
/*
|
|
* A reader-writer lock implementation that allows re-entrant reads, but
|
|
* still gives writers priority on "new" reads.
|
|
*
|
|
* See rrwlock.c for more details about the implementation.
|
|
*
|
|
* Fields of the rrwlock_t structure:
|
|
* - rr_lock: protects modification and reading of rrwlock_t fields
|
|
* - rr_cv: cv for waking up readers or waiting writers
|
|
* - rr_writer: thread id of the current writer
|
|
* - rr_anon_rount: number of active anonymous readers
|
|
* - rr_linked_rcount: total number of non-anonymous active readers
|
|
* - rr_writer_wanted: a writer wants the lock
|
|
*/
|
|
typedef struct rrwlock {
|
|
kmutex_t rr_lock;
|
|
kcondvar_t rr_cv;
|
|
kthread_t *rr_writer;
|
|
refcount_t rr_anon_rcount;
|
|
refcount_t rr_linked_rcount;
|
|
boolean_t rr_writer_wanted;
|
|
} rrwlock_t;
|
|
|
|
/*
|
|
* 'tag' is used in reference counting tracking. The
|
|
* 'tag' must be the same in a rrw_enter() as in its
|
|
* corresponding rrw_exit().
|
|
*/
|
|
void rrw_init(rrwlock_t *rrl);
|
|
void rrw_destroy(rrwlock_t *rrl);
|
|
void rrw_enter(rrwlock_t *rrl, krw_t rw, void *tag);
|
|
void rrw_exit(rrwlock_t *rrl, void *tag);
|
|
boolean_t rrw_held(rrwlock_t *rrl, krw_t rw);
|
|
void rrw_tsd_destroy(void *arg);
|
|
|
|
#define RRW_READ_HELD(x) rrw_held(x, RW_READER)
|
|
#define RRW_WRITE_HELD(x) rrw_held(x, RW_WRITER)
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _SYS_RR_RW_LOCK_H */
|