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
Add snapdev=[hidden|visible] dataset property
[zfs.git]
/
module
/
zfs
/
dmu_objset.c
diff --git
a/module/zfs/dmu_objset.c
b/module/zfs/dmu_objset.c
index
7da5c1a
..
50673dc
100644
(file)
--- a/
module/zfs/dmu_objset.c
+++ b/
module/zfs/dmu_objset.c
@@
-262,7
+262,7
@@
dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock));
ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock));
- os = kmem_zalloc(sizeof (objset_t), KM_
SLEEP
);
+ os = kmem_zalloc(sizeof (objset_t), KM_
PUSHPAGE
);
os->os_dsl_dataset = ds;
os->os_spa = spa;
os->os_rootbp = bp;
os->os_dsl_dataset = ds;
os->os_spa = spa;
os->os_rootbp = bp;
@@
-848,7
+848,7
@@
snapshot_check(void *arg1, void *arg2, dmu_tx_t *tx)
if (strlen(sn->htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
return (E2BIG);
if (strlen(sn->htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
return (E2BIG);
- sn->ha = kmem_alloc(sizeof
(struct dsl_ds_holdarg), KM_SLEEP
);
+ sn->ha = kmem_alloc(sizeof
(struct dsl_ds_holdarg), KM_PUSHPAGE
);
sn->ha->temphold = B_TRUE;
sn->ha->htag = sn->htag;
}
sn->ha->temphold = B_TRUE;
sn->ha->htag = sn->htag;
}
@@
-910,10
+910,8
@@
dmu_objset_snapshot_one(const char *name, void *arg)
* permission checks for the starting dataset have already been
* performed in zfs_secpolicy_snapshot()
*/
* permission checks for the starting dataset have already been
* performed in zfs_secpolicy_snapshot()
*/
-#ifdef HAVE_ZPL
if (sn->recursive && (err = zfs_secpolicy_snapshot_perms(name, CRED())))
return (err);
if (sn->recursive && (err = zfs_secpolicy_snapshot_perms(name, CRED())))
return (err);
-#endif
err = dmu_objset_hold(name, sn, &os);
if (err != 0)
err = dmu_objset_hold(name, sn, &os);
if (err != 0)
@@
-1184,17
+1182,6
@@
dmu_objset_is_dirty(objset_t *os, uint64_t txg)
!list_is_empty(&os->os_free_dnodes[txg & TXG_MASK]));
}
!list_is_empty(&os->os_free_dnodes[txg & TXG_MASK]));
}
-boolean_t
-dmu_objset_is_dirty_anywhere(objset_t *os)
-{
- int t;
-
- for (t = 0; t < TXG_SIZE; t++)
- if (dmu_objset_is_dirty(os, t))
- return (B_TRUE);
- return (B_FALSE);
-}
-
static objset_used_cb_t *used_cbs[DMU_OST_NUMTYPES];
void
static objset_used_cb_t *used_cbs[DMU_OST_NUMTYPES];
void
@@
-1587,6
+1574,12
@@
dmu_snapshot_list_next(objset_t *os, int namelen, char *name,
}
int
}
int
+dmu_snapshot_lookup(objset_t *os, const char *name, uint64_t *value)
+{
+ return dsl_dataset_snap_lookup(os->os_dsl_dataset, name, value);
+}
+
+int
dmu_dir_list_next(objset_t *os, int namelen, char *name,
uint64_t *idp, uint64_t *offp)
{
dmu_dir_list_next(objset_t *os, int namelen, char *name,
uint64_t *idp, uint64_t *offp)
{
@@
-1679,7
+1672,7
@@
dmu_objset_find_spa(spa_t *spa, const char *name,
}
thisobj = dd->dd_phys->dd_head_dataset_obj;
}
thisobj = dd->dd_phys->dd_head_dataset_obj;
- attr = kmem_alloc(sizeof (zap_attribute_t), KM_
SLEEP
);
+ attr = kmem_alloc(sizeof (zap_attribute_t), KM_
PUSHPAGE
);
dp = dd->dd_pool;
/*
dp = dd->dd_pool;
/*
@@
-1800,7
+1793,10
@@
dmu_objset_get_user(objset_t *os)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
+EXPORT_SYMBOL(dmu_objset_zil);
EXPORT_SYMBOL(dmu_objset_pool);
EXPORT_SYMBOL(dmu_objset_pool);
+EXPORT_SYMBOL(dmu_objset_ds);
+EXPORT_SYMBOL(dmu_objset_type);
EXPORT_SYMBOL(dmu_objset_name);
EXPORT_SYMBOL(dmu_objset_hold);
EXPORT_SYMBOL(dmu_objset_own);
EXPORT_SYMBOL(dmu_objset_name);
EXPORT_SYMBOL(dmu_objset_hold);
EXPORT_SYMBOL(dmu_objset_own);
@@
-1813,6
+1809,7
@@
EXPORT_SYMBOL(dmu_objset_destroy);
EXPORT_SYMBOL(dmu_objset_snapshot);
EXPORT_SYMBOL(dmu_objset_stats);
EXPORT_SYMBOL(dmu_objset_fast_stat);
EXPORT_SYMBOL(dmu_objset_snapshot);
EXPORT_SYMBOL(dmu_objset_stats);
EXPORT_SYMBOL(dmu_objset_fast_stat);
+EXPORT_SYMBOL(dmu_objset_spa);
EXPORT_SYMBOL(dmu_objset_space);
EXPORT_SYMBOL(dmu_objset_fsid_guid);
EXPORT_SYMBOL(dmu_objset_find);
EXPORT_SYMBOL(dmu_objset_space);
EXPORT_SYMBOL(dmu_objset_fsid_guid);
EXPORT_SYMBOL(dmu_objset_find);