mm: use zonelists instead of zones when direct reclaiming pages

[sfrench/cifs-2.6.git] / fs / xfs / xfs_trans_item.c

diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c
index 486147ef0e3d5dcac58d467476cd2fb2d3edf531..66a09f0d894b0c42b2eafb5a667bf1e0c57b4b97 100644 (file)
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
@@ -21,6 +21,7 @@
 #include "xfs_log.h"
 #include "xfs_inum.h"
 #include "xfs_trans.h"
+#include "xfs_trans_priv.h"
 
 STATIC int     xfs_trans_unlock_chunk(xfs_log_item_chunk_t *,
                                        int, int, xfs_lsn_t);
@@ -78,7 +79,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
                lidp->lid_size = 0;
                lip->li_desc = lidp;
                lip->li_mountp = tp->t_mountp;
-               return (lidp);
+               return lidp;
        }
 
        /*
@@ -119,7 +120,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
        lidp->lid_size = 0;
        lip->li_desc = lidp;
        lip->li_mountp = tp->t_mountp;
-       return (lidp);
+       return lidp;
 }
 
 /*
@@ -180,7 +181,7 @@ xfs_trans_find_item(xfs_trans_t     *tp, xfs_log_item_t *lip)
 {
        ASSERT(lip->li_desc != NULL);
 
-       return (lip->li_desc);
+       return lip->li_desc;
 }
 
 
@@ -219,10 +220,10 @@ xfs_trans_first_item(xfs_trans_t *tp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
        cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item");
-       return(NULL);
+       return NULL;
 }
 
 
@@ -252,7 +253,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
 
        /*
@@ -261,7 +262,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
         * If there is no next chunk, return NULL.
         */
        if (licp->lic_next == NULL) {
-               return (NULL);
+               return NULL;
        }
 
        licp = licp->lic_next;
@@ -271,7 +272,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
        ASSERT(0);
        /* NOTREACHED */
@@ -425,7 +426,7 @@ xfs_trans_unlock_chunk(
                }
        }
 
-       return (freed);
+       return freed;
 }
 
 
@@ -478,7 +479,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
                 */
                lbsp->lbc_ag = ag;
                lbsp->lbc_idx = idx;
-               return (lbsp);
+               return lbsp;
        }
 
        /*
@@ -493,7 +494,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
                                break;
                        } else {
                                /* out-of-order vacancy */
-                               printk("OOO vacancy lbcp 0x%p\n", lbcp);
+                               cmn_err(CE_DEBUG, "OOO vacancy lbcp 0x%p\n", lbcp);
                                ASSERT(0);
                        }
                }
@@ -512,7 +513,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
        tp->t_busy_free--;
        lbsp->lbc_ag = ag;
        lbsp->lbc_idx = idx;
-       return (lbsp);
+       return lbsp;
 }