land b_md onto HEAD. the highlights:

[fs/lustre-release.git] / lustre / include / linux / lustre_net.h

diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index e539d8e..fb060d0 100644 (file)
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -344,12 +344,11 @@ void *lustre_msg_buf(struct lustre_msg *m, int n);
 
 static inline void ptlrpc_bulk_decref(struct ptlrpc_bulk_desc *desc)
 {
+        CDEBUG(D_PAGE, "%p -> %d\n", desc, atomic_read(&desc->bd_refcount) - 1);
+
         if (atomic_dec_and_test(&desc->bd_refcount)) {
                 CDEBUG(D_PAGE, "Released last ref on %p, freeing\n", desc);
                 ptlrpc_free_bulk(desc);
-        } else {
-                CDEBUG(D_PAGE, "%p -> %d\n", desc,
-                       atomic_read(&desc->bd_refcount));
         }
 }