← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/xfs/xfs_buf_item.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/xfs/xfs_buf_item.c
130
130
        orig = bip->bli_orig;
131
131
        buffer = XFS_BUF_PTR(bp);
132
132
        for (x = 0; x < XFS_BUF_COUNT(bp); x++) {
133
 
                if (orig[x] != buffer[x] && !btst(bip->bli_logged, x))
134
 
                        cmn_err(CE_PANIC,
135
 
        "xfs_buf_item_log_check bip %x buffer %x orig %x index %d",
136
 
                                bip, bp, orig, x);
 
133
                if (orig[x] != buffer[x] && !btst(bip->bli_logged, x)) {
 
134
                        xfs_emerg(bp->b_mount,
 
135
                                "%s: bip %x buffer %x orig %x index %d",
 
136
                                __func__, bip, bp, orig, x);
 
137
                        ASSERT(0);
 
138
                }
137
139
        }
138
140
}
139
141
#else
983
985
        if (XFS_BUF_TARGET(bp) != lasttarg ||
984
986
            time_after(jiffies, (lasttime + 5*HZ))) {
985
987
                lasttime = jiffies;
986
 
                cmn_err(CE_ALERT, "Device %s, XFS metadata write error"
987
 
                                " block 0x%llx in %s",
 
988
                xfs_alert(mp, "Device %s: metadata write error block 0x%llx",
988
989
                        XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)),
989
 
                      (__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname);
 
990
                      (__uint64_t)XFS_BUF_ADDR(bp));
990
991
        }
991
992
        lasttarg = XFS_BUF_TARGET(bp);
992
993
 
993
994
        /*
994
 
         * If the write was asynchronous then noone will be looking for the
 
995
         * If the write was asynchronous then no one will be looking for the
995
996
         * error.  Clear the error state and write the buffer out again.
996
997
         *
997
998
         * During sync or umount we'll write all pending buffers again