* Added interface and socket queries to libcfs (libcfs/linux-tcpip.c). Some

     of this came from socknal_lib-linux.c but was generalised a little so all
     the NALs that use TCP/IP to do connection establishment can use it.

     CAVEAT EMPTOR! Just the linux versions are done; the darwin versions are
     not implemented yet.

     Changed socknal and ranal to use this.

*    Brought ranal up-to-date with new config + mod params for all tunables.
     Ranal gets its local address from the IP of a (single) specified
     interface, or the first "suitable" one found if no interface is specified.

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 0760eaa..0de68b6 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -110,8 +110,8 @@ static inline int cleanup_group_info(void)
 #define __clear_page_ll_data(page) \
         do {       \
                 ClearPagePrivate(page); \
-                page_cache_release(page); \
                 page->private = 0; \
+                page_cache_release(page); \
         } while(0)
 
 #define kiobuf bio

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 674d65e..e1a4e7c 100644 (file)
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -87,7 +87,7 @@ int class_add_uuid(char *uuid, __u64 nid)
         int rc;
         int nob = strnlen (uuid, PAGE_SIZE) + 1;
 
-        LASSERT(nid != 0);
+        LASSERT(nid != 0);  /* valid newconfig NID is never zero */
 
         if (nob > PAGE_SIZE)
                 return -EINVAL;

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 92575cc..3cfb2be 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1973,7 +1973,7 @@ static int osc_queue_async_io(struct obd_export *exp, struct lov_stripe_md *lsm,
         if (cmd == OBD_BRW_WRITE){
                 struct obd_async_page_ops *ops;
                 struct obdo *oa = NULL;
-                                                                                                                             
+
                 oa = obdo_alloc();
                 if (oa == NULL)
                         RETURN(-ENOMEM);