b=2127

A dbench run that ran into ENOSPC got stuck in the osc waiting for
rpcs to complete and free up room in the cache.  These changes make
the mechanics of waiting for the cache space less fragile.  After the
changes dbench could run into the ENOSPC condition and not get stuck.

diff --git a/lustre/ptlrpc/ptlrpc_lib.c b/lustre/ptlrpc/ptlrpc_lib.c
index 7f1853f..a7569c7 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_lib.c
+++ b/lustre/ptlrpc/ptlrpc_lib.c
@@ -101,7 +101,6 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
         cli->cl_dirty_max = 64*1024*1024; /* some default */
         cli->cl_ost_can_grant = 1;
         INIT_LIST_HEAD(&cli->cl_cache_waiters);
-        init_waitqueue_head(&cli->cl_cache_waitq);
         INIT_LIST_HEAD(&cli->cl_loi_ready_list);
         spin_lock_init(&cli->cl_loi_list_lock);
         cli->cl_brw_in_flight = 0;