1. Statically initialize swap_pager_full and swap_pager_almost_full to the
full state. (When swap is added their state will change appropriately.) 2. Set swap_pager_full and swap_pager_almost_full to the full state when the last swap device is removed. Combined these changes eliminate nonsense messages from the kernel on swap- less machines. Item 2 submitted by: Divacky Roman <xdivac02@stud.fit.vutbr.cz> Prodding by: phk
This commit is contained in:
parent
b871acbc45
commit
890250d35a
@ -187,8 +187,8 @@ static void swapdev_strategy(struct buf *, struct swdevt *sw);
|
||||
#define SWM_FREE 0x02 /* free, period */
|
||||
#define SWM_POP 0x04 /* pop out */
|
||||
|
||||
int swap_pager_full; /* swap space exhaustion (task killing) */
|
||||
static int swap_pager_almost_full; /* swap space exhaustion (w/ hysteresis)*/
|
||||
int swap_pager_full = 2; /* swap space exhaustion (task killing) */
|
||||
static int swap_pager_almost_full = 1; /* swap space exhaustion (w/hysteresis)*/
|
||||
static int nsw_rcount; /* free read buffers */
|
||||
static int nsw_wcount_sync; /* limit write buffers / synchronous */
|
||||
static int nsw_wcount_async; /* limit write buffers / asynchronous */
|
||||
@ -2267,6 +2267,10 @@ swapoff(struct thread *td, struct swapoff_args *uap)
|
||||
mtx_lock(&sw_dev_mtx);
|
||||
TAILQ_REMOVE(&swtailq, sp, sw_list);
|
||||
nswapdev--;
|
||||
if (nswapdev == 0) {
|
||||
swap_pager_full = 2;
|
||||
swap_pager_almost_full = 1;
|
||||
}
|
||||
if (swdevhd == sp)
|
||||
swdevhd = NULL;
|
||||
mtx_unlock(&sw_dev_mtx);
|
||||
|
Loading…
Reference in New Issue
Block a user