MFV r289561: 6328 Fix cstyle errors in zfs codebase
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Alex Reece <alex@delphix.com> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed by: Jorgen Lundman <lundman@lundman.net> Approved by: Robert Mustacchi <rm@joyent.com> Author: Paul Dagnelie <pcd@delphix.com> illumos/illumos-gate@9a686fbc18
This commit is contained in:
commit
6b513e2853
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=289562
@ -199,7 +199,8 @@ static boolean_t log_history = B_TRUE;
|
|||||||
static uint_t timestamp_fmt = NODATE;
|
static uint_t timestamp_fmt = NODATE;
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
get_usage(zpool_help_t idx) {
|
get_usage(zpool_help_t idx)
|
||||||
|
{
|
||||||
switch (idx) {
|
switch (idx) {
|
||||||
case HELP_ADD:
|
case HELP_ADD:
|
||||||
return (gettext("\tadd [-fn] <pool> <vdev> ...\n"));
|
return (gettext("\tadd [-fn] <pool> <vdev> ...\n"));
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
|
* Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
||||||
@ -315,7 +315,8 @@ typedef struct {
|
|||||||
} snapspec_arg_t;
|
} snapspec_arg_t;
|
||||||
|
|
||||||
static int
|
static int
|
||||||
snapspec_cb(zfs_handle_t *zhp, void *arg) {
|
snapspec_cb(zfs_handle_t *zhp, void *arg)
|
||||||
|
{
|
||||||
snapspec_arg_t *ssa = arg;
|
snapspec_arg_t *ssa = arg;
|
||||||
char *shortsnapname;
|
char *shortsnapname;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
|
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -1885,7 +1885,8 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
|
|||||||
* and the like.
|
* and the like.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
ctd_check_path(char *str) {
|
ctd_check_path(char *str)
|
||||||
|
{
|
||||||
/*
|
/*
|
||||||
* If it starts with a slash, check the last component.
|
* If it starts with a slash, check the last component.
|
||||||
*/
|
*/
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -523,7 +523,7 @@ vn_openat(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2,
|
|||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
int
|
int
|
||||||
vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
|
vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
|
||||||
int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
|
int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
|
||||||
{
|
{
|
||||||
ssize_t iolen, split;
|
ssize_t iolen, split;
|
||||||
|
|
||||||
|
@ -117,7 +117,8 @@ zfeature_lookup_name(const char *name, spa_feature_t *res)
|
|||||||
}
|
}
|
||||||
|
|
||||||
boolean_t
|
boolean_t
|
||||||
zfeature_depends_on(spa_feature_t fid, spa_feature_t check) {
|
zfeature_depends_on(spa_feature_t fid, spa_feature_t check)
|
||||||
|
{
|
||||||
zfeature_info_t *feature = &spa_feature_table[fid];
|
zfeature_info_t *feature = &spa_feature_table[fid];
|
||||||
|
|
||||||
for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) {
|
for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) {
|
||||||
|
@ -1739,7 +1739,7 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
|
|||||||
|
|
||||||
int
|
int
|
||||||
dmu_object_set_blocksize(objset_t *os, uint64_t object, uint64_t size, int ibs,
|
dmu_object_set_blocksize(objset_t *os, uint64_t object, uint64_t size, int ibs,
|
||||||
dmu_tx_t *tx)
|
dmu_tx_t *tx)
|
||||||
{
|
{
|
||||||
dnode_t *dn;
|
dnode_t *dn;
|
||||||
int err;
|
int err;
|
||||||
@ -1754,7 +1754,7 @@ dmu_object_set_blocksize(objset_t *os, uint64_t object, uint64_t size, int ibs,
|
|||||||
|
|
||||||
void
|
void
|
||||||
dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum,
|
dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum,
|
||||||
dmu_tx_t *tx)
|
dmu_tx_t *tx)
|
||||||
{
|
{
|
||||||
dnode_t *dn;
|
dnode_t *dn;
|
||||||
|
|
||||||
@ -1774,7 +1774,7 @@ dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum,
|
|||||||
|
|
||||||
void
|
void
|
||||||
dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress,
|
dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress,
|
||||||
dmu_tx_t *tx)
|
dmu_tx_t *tx)
|
||||||
{
|
{
|
||||||
dnode_t *dn;
|
dnode_t *dn;
|
||||||
|
|
||||||
@ -1944,7 +1944,8 @@ dmu_offset_next(objset_t *os, uint64_t object, boolean_t hole, uint64_t *off)
|
|||||||
* ID and wait for that to be synced.
|
* ID and wait for that to be synced.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
dmu_object_wait_synced(objset_t *os, uint64_t object) {
|
dmu_object_wait_synced(objset_t *os, uint64_t object)
|
||||||
|
{
|
||||||
dnode_t *dn;
|
dnode_t *dn;
|
||||||
int error, i;
|
int error, i;
|
||||||
|
|
||||||
|
@ -3558,7 +3558,7 @@ dsl_dataset_space_wouldfree(dsl_dataset_t *firstsnap,
|
|||||||
*/
|
*/
|
||||||
boolean_t
|
boolean_t
|
||||||
dsl_dataset_is_before(dsl_dataset_t *later, dsl_dataset_t *earlier,
|
dsl_dataset_is_before(dsl_dataset_t *later, dsl_dataset_t *earlier,
|
||||||
uint64_t earlier_txg)
|
uint64_t earlier_txg)
|
||||||
{
|
{
|
||||||
dsl_pool_t *dp = later->ds_dir->dd_pool;
|
dsl_pool_t *dp = later->ds_dir->dd_pool;
|
||||||
int error;
|
int error;
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
* Use is subject to license terms.
|
* Use is subject to license terms.
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/zfs_context.h>
|
#include <sys/zfs_context.h>
|
||||||
@ -103,7 +103,7 @@ space_reftree_add_node(avl_tree_t *t, uint64_t offset, int64_t refcnt)
|
|||||||
|
|
||||||
void
|
void
|
||||||
space_reftree_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
|
space_reftree_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
|
||||||
int64_t refcnt)
|
int64_t refcnt)
|
||||||
{
|
{
|
||||||
space_reftree_add_node(t, start, refcnt);
|
space_reftree_add_node(t, start, refcnt);
|
||||||
space_reftree_add_node(t, end, -refcnt);
|
space_reftree_add_node(t, end, -refcnt);
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
* Copyright (c) 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SYS_ZRLOCK_H
|
#ifndef _SYS_ZRLOCK_H
|
||||||
@ -44,12 +45,8 @@ typedef struct zrlock {
|
|||||||
|
|
||||||
extern void zrl_init(zrlock_t *);
|
extern void zrl_init(zrlock_t *);
|
||||||
extern void zrl_destroy(zrlock_t *);
|
extern void zrl_destroy(zrlock_t *);
|
||||||
#ifdef ZFS_DEBUG
|
#define zrl_add(_z) zrl_add_impl((_z), __func__)
|
||||||
#define zrl_add(_z) zrl_add_debug((_z), __func__)
|
extern void zrl_add_impl(zrlock_t *, const char *);
|
||||||
extern void zrl_add_debug(zrlock_t *, const char *);
|
|
||||||
#else
|
|
||||||
extern void zrl_add(zrlock_t *);
|
|
||||||
#endif
|
|
||||||
extern void zrl_remove(zrlock_t *);
|
extern void zrl_remove(zrlock_t *);
|
||||||
extern int zrl_tryenter(zrlock_t *);
|
extern int zrl_tryenter(zrlock_t *);
|
||||||
extern void zrl_exit(zrlock_t *);
|
extern void zrl_exit(zrlock_t *);
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -185,7 +185,7 @@ vdev_label_number(uint64_t psize, uint64_t offset)
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
vdev_label_read(zio_t *zio, vdev_t *vd, int l, void *buf, uint64_t offset,
|
vdev_label_read(zio_t *zio, vdev_t *vd, int l, void *buf, uint64_t offset,
|
||||||
uint64_t size, zio_done_func_t *done, void *private, int flags)
|
uint64_t size, zio_done_func_t *done, void *private, int flags)
|
||||||
{
|
{
|
||||||
ASSERT(spa_config_held(zio->io_spa, SCL_STATE_ALL, RW_WRITER) ==
|
ASSERT(spa_config_held(zio->io_spa, SCL_STATE_ALL, RW_WRITER) ==
|
||||||
SCL_STATE_ALL);
|
SCL_STATE_ALL);
|
||||||
@ -199,7 +199,7 @@ vdev_label_read(zio_t *zio, vdev_t *vd, int l, void *buf, uint64_t offset,
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
vdev_label_write(zio_t *zio, vdev_t *vd, int l, void *buf, uint64_t offset,
|
vdev_label_write(zio_t *zio, vdev_t *vd, int l, void *buf, uint64_t offset,
|
||||||
uint64_t size, zio_done_func_t *done, void *private, int flags)
|
uint64_t size, zio_done_func_t *done, void *private, int flags)
|
||||||
{
|
{
|
||||||
ASSERT(spa_config_held(zio->io_spa, SCL_ALL, RW_WRITER) == SCL_ALL ||
|
ASSERT(spa_config_held(zio->io_spa, SCL_ALL, RW_WRITER) == SCL_ALL ||
|
||||||
(spa_config_held(zio->io_spa, SCL_CONFIG | SCL_STATE, RW_READER) ==
|
(spa_config_held(zio->io_spa, SCL_CONFIG | SCL_STATE, RW_READER) ==
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -535,7 +535,7 @@ zap_entry_read_name(zap_t *zap, const zap_entry_handle_t *zeh, uint16_t buflen,
|
|||||||
|
|
||||||
int
|
int
|
||||||
zap_entry_update(zap_entry_handle_t *zeh,
|
zap_entry_update(zap_entry_handle_t *zeh,
|
||||||
uint8_t integer_size, uint64_t num_integers, const void *buf)
|
uint8_t integer_size, uint64_t num_integers, const void *buf)
|
||||||
{
|
{
|
||||||
int delta_chunks;
|
int delta_chunks;
|
||||||
zap_leaf_t *l = zeh->zeh_leaf;
|
zap_leaf_t *l = zeh->zeh_leaf;
|
||||||
|
@ -269,7 +269,8 @@ feature_get_refcount_from_disk(spa_t *spa, zfeature_info_t *feature,
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res) {
|
feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res)
|
||||||
|
{
|
||||||
uint64_t enabled_txg_obj = spa->spa_feat_enabled_txg_obj;
|
uint64_t enabled_txg_obj = spa->spa_feat_enabled_txg_obj;
|
||||||
|
|
||||||
ASSERT(zfeature_depends_on(feature->fi_feature,
|
ASSERT(zfeature_depends_on(feature->fi_feature,
|
||||||
@ -493,7 +494,8 @@ spa_feature_is_active(spa_t *spa, spa_feature_t fid)
|
|||||||
* Returns B_FALSE otherwise (i.e. if the feature is not enabled).
|
* Returns B_FALSE otherwise (i.e. if the feature is not enabled).
|
||||||
*/
|
*/
|
||||||
boolean_t
|
boolean_t
|
||||||
spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg) {
|
spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg)
|
||||||
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
ASSERT(VALID_FEATURE_FID(fid));
|
ASSERT(VALID_FEATURE_FID(fid));
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -806,7 +806,7 @@ zfs_dropname(zfs_dirlock_t *dl, znode_t *zp, znode_t *dzp, dmu_tx_t *tx,
|
|||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
zfs_link_destroy(zfs_dirlock_t *dl, znode_t *zp, dmu_tx_t *tx, int flag,
|
zfs_link_destroy(zfs_dirlock_t *dl, znode_t *zp, dmu_tx_t *tx, int flag,
|
||||||
boolean_t *unlinkedp)
|
boolean_t *unlinkedp)
|
||||||
{
|
{
|
||||||
znode_t *dzp = dl->dl_dzp;
|
znode_t *dzp = dl->dl_dzp;
|
||||||
zfsvfs_t *zfsvfs = dzp->z_zfsvfs;
|
zfsvfs_t *zfsvfs = dzp->z_zfsvfs;
|
||||||
|
@ -5708,7 +5708,7 @@ zfs_ioctl_register_dataset_read(zfs_ioc_t ioc, zfs_ioc_legacy_func_t *func)
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
zfs_ioctl_register_dataset_modify(zfs_ioc_t ioc, zfs_ioc_legacy_func_t *func,
|
zfs_ioctl_register_dataset_modify(zfs_ioc_t ioc, zfs_ioc_legacy_func_t *func,
|
||||||
zfs_secpolicy_func_t *secpolicy)
|
zfs_secpolicy_func_t *secpolicy)
|
||||||
{
|
{
|
||||||
zfs_ioctl_register_legacy(ioc, func, secpolicy,
|
zfs_ioctl_register_legacy(ioc, func, secpolicy,
|
||||||
DATASET_NAME, B_TRUE, POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY);
|
DATASET_NAME, B_TRUE, POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY);
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
* Copyright (c) 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -348,7 +349,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
||||||
znode_t *dzp, char *name, uint64_t foid)
|
znode_t *dzp, char *name, uint64_t foid)
|
||||||
{
|
{
|
||||||
itx_t *itx;
|
itx_t *itx;
|
||||||
lr_remove_t *lr;
|
lr_remove_t *lr;
|
||||||
@ -372,7 +373,7 @@ zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zfs_log_link(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
zfs_log_link(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
||||||
znode_t *dzp, znode_t *zp, char *name)
|
znode_t *dzp, znode_t *zp, char *name)
|
||||||
{
|
{
|
||||||
itx_t *itx;
|
itx_t *itx;
|
||||||
lr_link_t *lr;
|
lr_link_t *lr;
|
||||||
@ -427,7 +428,7 @@ zfs_log_symlink(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zfs_log_rename(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
zfs_log_rename(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
|
||||||
znode_t *sdzp, char *sname, znode_t *tdzp, char *dname, znode_t *szp)
|
znode_t *sdzp, char *sname, znode_t *tdzp, char *dname, znode_t *szp)
|
||||||
{
|
{
|
||||||
itx_t *itx;
|
itx_t *itx;
|
||||||
lr_rename_t *lr;
|
lr_rename_t *lr;
|
||||||
@ -455,7 +456,7 @@ ssize_t zfs_immediate_write_sz = 32768;
|
|||||||
|
|
||||||
void
|
void
|
||||||
zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
||||||
znode_t *zp, offset_t off, ssize_t resid, int ioflag)
|
znode_t *zp, offset_t off, ssize_t resid, int ioflag)
|
||||||
{
|
{
|
||||||
itx_wr_state_t write_state;
|
itx_wr_state_t write_state;
|
||||||
boolean_t slogging;
|
boolean_t slogging;
|
||||||
@ -532,7 +533,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
||||||
znode_t *zp, uint64_t off, uint64_t len)
|
znode_t *zp, uint64_t off, uint64_t len)
|
||||||
{
|
{
|
||||||
itx_t *itx;
|
itx_t *itx;
|
||||||
lr_truncate_t *lr;
|
lr_truncate_t *lr;
|
||||||
@ -555,7 +556,7 @@ zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype,
|
||||||
znode_t *zp, vattr_t *vap, uint_t mask_applied, zfs_fuid_info_t *fuidp)
|
znode_t *zp, vattr_t *vap, uint_t mask_applied, zfs_fuid_info_t *fuidp)
|
||||||
{
|
{
|
||||||
itx_t *itx;
|
itx_t *itx;
|
||||||
lr_setattr_t *lr;
|
lr_setattr_t *lr;
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -54,7 +54,7 @@
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
|
zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
|
||||||
uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
|
uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
|
||||||
{
|
{
|
||||||
VATTR_NULL(vap);
|
VATTR_NULL(vap);
|
||||||
vap->va_mask = (uint_t)mask;
|
vap->va_mask = (uint_t)mask;
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2012, 2015 by Delphix. All rights reserved.
|
||||||
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -4520,7 +4520,7 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, char *name, cred_t *cr,
|
|||||||
/* ARGSUSED */
|
/* ARGSUSED */
|
||||||
static int
|
static int
|
||||||
zfs_null_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
|
zfs_null_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
|
||||||
size_t *lenp, int flags, cred_t *cr)
|
size_t *lenp, int flags, cred_t *cr)
|
||||||
{
|
{
|
||||||
pvn_write_done(pp, B_INVAL|B_FORCE|B_ERROR);
|
pvn_write_done(pp, B_INVAL|B_FORCE|B_ERROR);
|
||||||
return (0);
|
return (0);
|
||||||
@ -4546,7 +4546,7 @@ zfs_null_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
|
|||||||
/* ARGSUSED */
|
/* ARGSUSED */
|
||||||
static int
|
static int
|
||||||
zfs_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
|
zfs_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
|
||||||
size_t *lenp, int flags, cred_t *cr)
|
size_t *lenp, int flags, cred_t *cr)
|
||||||
{
|
{
|
||||||
znode_t *zp = VTOZ(vp);
|
znode_t *zp = VTOZ(vp);
|
||||||
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
|
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
|
||||||
|
@ -328,7 +328,7 @@ zio_data_buf_free(void *buf, size_t size)
|
|||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
zio_push_transform(zio_t *zio, void *data, uint64_t size, uint64_t bufsize,
|
zio_push_transform(zio_t *zio, void *data, uint64_t size, uint64_t bufsize,
|
||||||
zio_transform_func_t *transform)
|
zio_transform_func_t *transform)
|
||||||
{
|
{
|
||||||
zio_transform_t *zt = kmem_alloc(sizeof (zio_transform_t), KM_SLEEP);
|
zio_transform_t *zt = kmem_alloc(sizeof (zio_transform_t), KM_SLEEP);
|
||||||
|
|
||||||
@ -1066,8 +1066,8 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
|
|||||||
|
|
||||||
zio_t *
|
zio_t *
|
||||||
zio_vdev_delegated_io(vdev_t *vd, uint64_t offset, void *data, uint64_t size,
|
zio_vdev_delegated_io(vdev_t *vd, uint64_t offset, void *data, uint64_t size,
|
||||||
int type, zio_priority_t priority, enum zio_flag flags,
|
int type, zio_priority_t priority, enum zio_flag flags,
|
||||||
zio_done_func_t *done, void *private)
|
zio_done_func_t *done, void *private)
|
||||||
{
|
{
|
||||||
zio_t *zio;
|
zio_t *zio;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
* Copyright (c) 2013, 2015 by Delphix. All rights reserved.
|
||||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||||
* Copyright 2013 Saso Kiselkov. All rights reserved.
|
* Copyright 2013 Saso Kiselkov. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -249,7 +249,7 @@ zio_checksum_template_init(enum zio_checksum checksum, spa_t *spa)
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
zio_checksum_compute(zio_t *zio, enum zio_checksum checksum,
|
zio_checksum_compute(zio_t *zio, enum zio_checksum checksum,
|
||||||
void *data, uint64_t size)
|
void *data, uint64_t size)
|
||||||
{
|
{
|
||||||
blkptr_t *bp = zio->io_bp;
|
blkptr_t *bp = zio->io_bp;
|
||||||
uint64_t offset = zio->io_offset;
|
uint64_t offset = zio->io_offset;
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2014 by Delphix. All rights reserved.
|
* Copyright (c) 2014, 2015 by Delphix. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -69,11 +69,7 @@ zrl_destroy(zrlock_t *zrl)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
#ifdef ZFS_DEBUG
|
zrl_add_impl(zrlock_t *zrl, const char *zc)
|
||||||
zrl_add_debug(zrlock_t *zrl, const char *zc)
|
|
||||||
#else
|
|
||||||
zrl_add(zrlock_t *zrl)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
uint32_t n = (uint32_t)zrl->zr_refcount;
|
uint32_t n = (uint32_t)zrl->zr_refcount;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user