git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rw_init() usage
[zfs.git]
/
module
/
zfs
/
dmu_objset.c
diff --git
a/module/zfs/dmu_objset.c
b/module/zfs/dmu_objset.c
index
bacd62c
..
2d06897
100644
(file)
--- a/
module/zfs/dmu_objset.c
+++ b/
module/zfs/dmu_objset.c
@@
-1016,7
+1016,7
@@
dmu_objset_sync_dnodes(list_t *list, list_t *newlist, dmu_tx_t *tx)
{
dnode_t *dn;
{
dnode_t *dn;
- while (
dn = list_head(list
)) {
+ while (
(dn = list_head(list)
)) {
ASSERT(dn->dn_object != DMU_META_DNODE_OBJECT);
ASSERT(dn->dn_dbuf->db_data_pending);
/*
ASSERT(dn->dn_object != DMU_META_DNODE_OBJECT);
ASSERT(dn->dn_dbuf->db_data_pending);
/*
@@
-1157,7
+1157,7
@@
dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
dmu_objset_sync_dnodes(&os->os_dirty_dnodes[txgoff], newlist, tx);
list = &DMU_META_DNODE(os)->dn_dirty_records[txgoff];
dmu_objset_sync_dnodes(&os->os_dirty_dnodes[txgoff], newlist, tx);
list = &DMU_META_DNODE(os)->dn_dirty_records[txgoff];
- while (
dr = list_head(list)
) {
+ while (
(dr = list_head(list)) != NULL
) {
ASSERT(dr->dr_dbuf->db_level == 0);
list_remove(list, dr);
if (dr->dr_zio)
ASSERT(dr->dr_dbuf->db_level == 0);
list_remove(list, dr);
if (dr->dr_zio)
@@
-1228,7
+1228,7
@@
dmu_objset_do_userquota_updates(objset_t *os, dmu_tx_t *tx)
ASSERT(list_head(list) == NULL || dmu_objset_userused_enabled(os));
ASSERT(list_head(list) == NULL || dmu_objset_userused_enabled(os));
- while (
dn = list_head(list)
) {
+ while (
(dn = list_head(list)) != NULL
) {
int flags;
ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object));
ASSERT(dn->dn_phys->dn_type == DMU_OT_NONE ||
int flags;
ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object));
ASSERT(dn->dn_phys->dn_type == DMU_OT_NONE ||
@@
-1331,7
+1331,7
@@
dmu_objset_userquota_get_ids(dnode_t *dn, boolean_t before, dmu_tx_t *tx)
objset_t *os = dn->dn_objset;
void *data = NULL;
dmu_buf_impl_t *db = NULL;
objset_t *os = dn->dn_objset;
void *data = NULL;
dmu_buf_impl_t *db = NULL;
- uint64_t *user
, *group
;
+ uint64_t *user
= NULL, *group = NULL
;
int flags = dn->dn_id_flags;
int error;
boolean_t have_spill = B_FALSE;
int flags = dn->dn_id_flags;
int error;
boolean_t have_spill = B_FALSE;