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
Linux 2.6.29 compat, .freeze_fs/.unfreeze_fs
[zfs.git]
/
module
/
zfs
/
arc.c
diff --git
a/module/zfs/arc.c
b/module/zfs/arc.c
index
f8dfee2
..
3a45730
100644
(file)
--- a/
module/zfs/arc.c
+++ b/
module/zfs/arc.c
@@
-2149,7
+2149,7
@@
arc_reclaim_thread(void)
/* block until needed, or one second, whichever is shorter */
CALLB_CPR_SAFE_BEGIN(&cpr);
/* block until needed, or one second, whichever is shorter */
CALLB_CPR_SAFE_BEGIN(&cpr);
- (void) cv_timedwait(&arc_reclaim_thr_cv,
+ (void) cv_timedwait
_interruptible
(&arc_reclaim_thr_cv,
&arc_reclaim_thr_lock, (ddi_get_lbolt() + hz));
CALLB_CPR_SAFE_END(&cpr, &arc_reclaim_thr_lock);
}
&arc_reclaim_thr_lock, (ddi_get_lbolt() + hz));
CALLB_CPR_SAFE_END(&cpr, &arc_reclaim_thr_lock);
}
@@
-2720,7
+2720,7
@@
top:
arc_callback_t *acb = NULL;
acb = kmem_zalloc(sizeof (arc_callback_t),
arc_callback_t *acb = NULL;
acb = kmem_zalloc(sizeof (arc_callback_t),
- KM_
SLEEP
);
+ KM_
PUSHPAGE
);
acb->acb_done = done;
acb->acb_private = private;
if (pio != NULL)
acb->acb_done = done;
acb->acb_private = private;
if (pio != NULL)
@@
-2777,7
+2777,7
@@
top:
uint64_t size = BP_GET_LSIZE(bp);
arc_callback_t *acb;
vdev_t *vd = NULL;
uint64_t size = BP_GET_LSIZE(bp);
arc_callback_t *acb;
vdev_t *vd = NULL;
-
daddr
_t addr = -1;
+
uint64
_t addr = -1;
boolean_t devw = B_FALSE;
if (hdr == NULL) {
boolean_t devw = B_FALSE;
if (hdr == NULL) {
@@
-2836,7
+2836,7
@@
top:
ASSERT(!GHOST_STATE(hdr->b_state));
ASSERT(!GHOST_STATE(hdr->b_state));
- acb = kmem_zalloc(sizeof (arc_callback_t), KM_
SLEEP
);
+ acb = kmem_zalloc(sizeof (arc_callback_t), KM_
PUSHPAGE
);
acb->acb_done = done;
acb->acb_private = private;
acb->acb_done = done;
acb->acb_private = private;
@@
-2885,7
+2885,7
@@
top:
ARCSTAT_BUMP(arcstat_l2_hits);
cb = kmem_zalloc(sizeof (l2arc_read_callback_t),
ARCSTAT_BUMP(arcstat_l2_hits);
cb = kmem_zalloc(sizeof (l2arc_read_callback_t),
- KM_
SLEEP
);
+ KM_
PUSHPAGE
);
cb->l2rcb_buf = buf;
cb->l2rcb_spa = spa;
cb->l2rcb_bp = *bp;
cb->l2rcb_buf = buf;
cb->l2rcb_spa = spa;
cb->l2rcb_bp = *bp;
@@
-4435,8
+4435,8
@@
l2arc_feed_thread(void)
while (l2arc_thread_exit == 0) {
CALLB_CPR_SAFE_BEGIN(&cpr);
while (l2arc_thread_exit == 0) {
CALLB_CPR_SAFE_BEGIN(&cpr);
- (void) cv_timedwait
(&l2arc_feed_thr_cv, &l2arc_feed_thr_lock
,
- next);
+ (void) cv_timedwait
_interruptible(&l2arc_feed_thr_cv
,
+
&l2arc_feed_thr_lock,
next);
CALLB_CPR_SAFE_END(&cpr, &l2arc_feed_thr_lock);
next = ddi_get_lbolt() + hz;
CALLB_CPR_SAFE_END(&cpr, &l2arc_feed_thr_lock);
next = ddi_get_lbolt() + hz;