Merge b1_4_smallfix from b1_4 (20050301_1341)

- don't LASSERT in ll_release on NULL lld with NFS export (4655, 5760)
- hold NS lock when calling handle_ast_error->del_waiting_lock (5746)
- fix setattr mtime regression from lovcleanup merge (4829, 5669)
- workaround for 2.6 crash in ll_unhash_aliases (5687, 5210)
- small ext3 extents cleanups and fixes (5733)
- improved mballoc code, several small races and bugs fixed (5733, 5638)
- kernel version 43: fix remove_suid bugs in both 2.4 and 2.6 (5695)
- avoid needless client->OST connect, fix handle mismatch (5317)
- fix lustre/lustrefs init scripts for SuSE (patch from Scali, 5702)
- don't hold the pinger_sem in ptlrpc_pinger_sending_on_import
- change obd_increase_kms to obd_adjust_kms (up or down) (5654)

diff --git a/lnet/include/libcfs/darwin/darwin-prim.h b/lnet/include/libcfs/darwin/darwin-prim.h
index ce9078d..109fb2f 100644 (file)
--- a/lnet/include/libcfs/darwin/darwin-prim.h
+++ b/lnet/include/libcfs/darwin/darwin-prim.h
@@ -539,7 +539,7 @@ static inline long PTR_ERR(const void *ptr)
 #define IS_ERR(p)      (0)
 
 /*
- * Error nubmer
+ * Error number
  */
 #define EBADR          EBADRPC
 #define ERESTARTSYS    ERESTART

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 3442c25..517f553 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -170,9 +170,9 @@ typedef struct
 
         atomic_t          ksnd_nactive_ltxs;    /* #active ltxs */
 
-        struct list_head  ksnd_deathrow_conns;  /* conns to be closed */
-        struct list_head  ksnd_zombie_conns;    /* conns to be freed */
-        struct list_head  ksnd_enomem_conns;    /* conns to be retried */
+        struct list_head  ksnd_deathrow_conns;  /* conns to close: reaper_lock*/
+        struct list_head  ksnd_zombie_conns;    /* conns to free: reaper_lock */
+        struct list_head  ksnd_enomem_conns;    /* conns to retry: reaper_lock*/
         cfs_waitq_t       ksnd_reaper_waitq;    /* reaper sleeps here */
         cfs_time_t        ksnd_reaper_waketime; /* when reaper will wake */
         spinlock_t        ksnd_reaper_lock;     /* serialise */

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 33b721d..1c8a1cc 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -600,6 +600,7 @@ ksocknal_find_conn_locked (ksock_tx_t *tx, ksock_peer_t *peer)
 
                 switch (c->ksnc_type) {
                 default:
+                        CERROR("ksnc_type bad: %u\n", c->ksnc_type);
                         LBUG();
                 case SOCKNAL_CONN_ANY:
                         break;