Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-07 16:09:19 -07:00
parent 380ece3068 b8af4a2181
commit e122a47cd8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/dmu_objset.c
View File

@ -1046,7 +1046,7 @@ dmu_objset_do_userquota_callbacks(objset_impl_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))) {
dmu_object_type_t bonustype; dmu_object_type_t bonustype;
ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object)); ASSERT(!DMU_OBJECT_IS_SPECIAL(dn->dn_object));

2
module/zfs/dsl_prop.c
View File

@ -510,7 +510,7 @@ dsl_props_set(const char *dsname, nvlist_t *nvl)
nvpair_t *elem = NULL; nvpair_t *elem = NULL;
int err; int err;
if (err = dsl_dataset_hold(dsname, FTAG, &ds)) if ((err = dsl_dataset_hold(dsname, FTAG, &ds)))
return (err); return (err);
/* /*
* Do these checks before the syncfunc, since it can't fail. * Do these checks before the syncfunc, since it can't fail.