2 files changed, 12 insertions, 12 deletions

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 9d4c4fbeb3ee..9bfb69e1e885 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2185,13 +2185,13 @@ xlog_state_do_callback(
                         }
                         cb = iclog->ic_callback;
 
-                        while (cb != 0) {
+                        while (cb) {
                                 iclog->ic_callback_tail = &(iclog->ic_callback);
                                 iclog->ic_callback = NULL;
                                 LOG_UNLOCK(log, s);
 
                                 /* perform callbacks in the order given */
-                                for (; cb != 0; cb = cb_next) {
+                                for (; cb; cb = cb_next) {
                                         cb_next = cb->cb_next;
                                         cb->cb_func(cb->cb_arg, aborted);
                                 }
@@ -2202,7 +2202,7 @@ xlog_state_do_callback(
                         loopdidcallbacks++;
                         funcdidcallbacks++;
 
-                        ASSERT(iclog->ic_callback == 0);
+                        ASSERT(iclog->ic_callback == NULL);
                         if (!(iclog->ic_state & XLOG_STATE_IOERROR))
                                 iclog->ic_state = XLOG_STATE_DIRTY;
 
@@ -3242,10 +3242,10 @@ xlog_ticket_put(xlog_t		*log,
 #else
         /* When we debug, it is easier if tickets are cycled */
         ticket->t_next     = NULL;
-        if (log->l_tail != 0) {
+        if (log->l_tail) {
                 log->l_tail->t_next = ticket;
         } else {
-                ASSERT(log->l_freelist == 0);
+                ASSERT(log->l_freelist == NULL);
                 log->l_freelist = ticket;
         }
         log->l_tail         = ticket;
@@ -3463,7 +3463,7 @@ xlog_verify_iclog(xlog_t	 *log,
         s = LOG_LOCK(log);
         icptr = log->l_iclog;
         for (i=0; i < log->l_iclog_bufs; i++) {
-                if (icptr == 0)
+                if (icptr == NULL)
                         xlog_panic("xlog_verify_iclog: invalid ptr");
                 icptr = icptr->ic_next;
         }
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index fddbb091a86f..8ae6e8e5f3db 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1366,7 +1366,7 @@ xlog_recover_add_to_cont_trans(
         int                     old_len;
 
         item = trans->r_itemq;
-        if (item == 0) {
+        if (item == NULL) {
                 /* finish copying rest of trans header */
                 xlog_recover_add_item(&trans->r_itemq);
                 ptr = (xfs_caddr_t) &trans->r_theader +
@@ -1412,7 +1412,7 @@ xlog_recover_add_to_trans(
         if (!len)
                 return 0;
         item = trans->r_itemq;
-        if (item == 0) {
+        if (item == NULL) {
                 ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC);
                 if (len == sizeof(xfs_trans_header_t))
                         xlog_recover_add_item(&trans->r_itemq);
@@ -1467,12 +1467,12 @@ xlog_recover_unlink_tid(
         xlog_recover_t          *tp;
         int                     found = 0;
 
-        ASSERT(trans != 0);
+        ASSERT(trans != NULL);
         if (trans == *q) {
                 *q = (*q)->r_next;
         } else {
                 tp = *q;
-                while (tp != 0) {
+                while (tp) {
                         if (tp->r_next == trans) {
                                 found = 1;
                                 break;
@@ -1495,7 +1495,7 @@ xlog_recover_insert_item_backq(
         xlog_recover_item_t     **q,
         xlog_recover_item_t     *item)
 {
-        if (*q == 0) {
+        if (*q == NULL) {
                 item->ri_prev = item->ri_next = item;
                 *q = item;
         } else {
@@ -1899,7 +1899,7 @@ xlog_recover_do_reg_buffer(
                         break;
                 nbits = xfs_contig_bits(data_map, map_size, bit);
                 ASSERT(nbits > 0);
-                ASSERT(item->ri_buf[i].i_addr != 0);
+                ASSERT(item->ri_buf[i].i_addr != NULL);
                 ASSERT(item->ri_buf[i].i_len % XFS_BLI_CHUNK == 0);
                 ASSERT(XFS_BUF_COUNT(bp) >=
                        ((uint)bit << XFS_BLI_SHIFT)+(nbits<<XFS_BLI_SHIFT));