Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
  xfs: don't name variables "panic"
  xfs: factor agf counter updates into a helper
  xfs: clean up the xfs_alloc_compute_aligned calling convention
  xfs: kill support/debug.[ch]
  xfs: Convert remaining cmn_err() callers to new API
  xfs: convert the quota debug prints to new API
  xfs: rename xfs_cmn_err_fsblock_zero()
  xfs: convert xfs_fs_cmn_err to new error logging API
  xfs: kill xfs_fs_mount_cmn_err() macro
  xfs: kill xfs_fs_repair_cmn_err() macro
  xfs: convert xfs_cmn_err to xfs_alert_tag
  xfs: Convert xlog_warn to new logging interface
  xfs: Convert linux-2.6/ files to new logging interface
  xfs: introduce new logging API.
  xfs: zero proper structure size for geometry calls
  xfs: enable delaylog by default
  xfs: more sensible inode refcounting for ialloc
  xfs: stop using xfs_trans_iget in the RT allocator
  xfs: check if device support discard in xfs_ioc_trim()
  xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
  ...

diff --combined fs/xfs/Makefile
index 82b1371,fee7901..284a7c8
--- 1/fs/xfs/Makefile
--- 2/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@@ -16,11 -16,14 +16,11 @@@
  # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  #
  
 -EXTRA_CFLAGS +=        -I$(src) -I$(src)/linux-2.6
 +ccflags-y := -I$(src) -I$(src)/linux-2.6
 +ccflags-$(CONFIG_XFS_DEBUG) += -g
  
  XFS_LINUX := linux-2.6
  
 -ifeq ($(CONFIG_XFS_DEBUG),y)
 -      EXTRA_CFLAGS += -g
 -endif
 -
  obj-$(CONFIG_XFS_FS)          += xfs.o
  
  xfs-y                         += linux-2.6/xfs_trace.o
@@@ -102,11 -105,10 +102,10 @@@ xfs-y                           += $(addprefix $(XFS_LINUX)/, 
                                   xfs_globals.o \
                                   xfs_ioctl.o \
                                   xfs_iops.o \
+                                  xfs_message.o \
                                   xfs_super.o \
                                   xfs_sync.o \
                                   xfs_xattr.o)
  
  # Objects in support/
- xfs-y                         += $(addprefix support/, \
-                                  debug.o \
-                                  uuid.o)
+ xfs-y                         += support/uuid.o

diff --combined fs/xfs/linux-2.6/xfs_buf.c
index f83a4c8,3cc671c..5cb230f
--- 1/fs/xfs/linux-2.6/xfs_buf.c
--- 2/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@@ -401,9 -401,8 +401,8 @@@ _xfs_buf_lookup_pages
                         * handle buffer allocation failures we can't do much.
                         */
                        if (!(++retries % 100))
-                               printk(KERN_ERR
-                                       "XFS: possible memory allocation "
-                                       "deadlock in %s (mode:0x%x)\n",
+                               xfs_err(NULL,
+               "possible memory allocation deadlock in %s (mode:0x%x)",
                                        __func__, gfp_mask);
  
                        XFS_STATS_INC(xb_page_retries);
@@@ -615,8 -614,8 +614,8 @@@ xfs_buf_get
        if (!(bp->b_flags & XBF_MAPPED)) {
                error = _xfs_buf_map_pages(bp, flags);
                if (unlikely(error)) {
-                       printk(KERN_WARNING "%s: failed to map pages\n",
-                                       __func__);
+                       xfs_warn(target->bt_mount,
+                               "%s: failed to map pages\n", __func__);
                        goto no_buffer;
                }
        }
@@@ -850,8 -849,8 +849,8 @@@ xfs_buf_get_uncached
  
        error = _xfs_buf_map_pages(bp, XBF_MAPPED);
        if (unlikely(error)) {
-               printk(KERN_WARNING "%s: failed to map pages\n",
-                               __func__);
+               xfs_warn(target->bt_mount,
+                       "%s: failed to map pages\n", __func__);
                goto fail_free_mem;
        }
  
@@@ -1617,8 -1616,8 +1616,8 @@@ xfs_setsize_buftarg_flags
        btp->bt_smask = sectorsize - 1;
  
        if (set_blocksize(btp->bt_bdev, sectorsize)) {
-               printk(KERN_WARNING
-                       "XFS: Cannot set_blocksize to %u on device %s\n",
+               xfs_warn(btp->bt_mount,
+                       "Cannot set_blocksize to %u on device %s\n",
                        sectorsize, XFS_BUFTARG_NAME(btp));
                return EINVAL;
        }
@@@ -2022,12 -2021,11 +2021,12 @@@ xfs_buf_init(void
        if (!xfslogd_workqueue)
                goto out_free_buf_zone;
  
 -      xfsdatad_workqueue = create_workqueue("xfsdatad");
 +      xfsdatad_workqueue = alloc_workqueue("xfsdatad", WQ_MEM_RECLAIM, 1);
        if (!xfsdatad_workqueue)
                goto out_destroy_xfslogd_workqueue;
  
 -      xfsconvertd_workqueue = create_workqueue("xfsconvertd");
 +      xfsconvertd_workqueue = alloc_workqueue("xfsconvertd",
 +                                              WQ_MEM_RECLAIM, 1);
        if (!xfsconvertd_workqueue)
                goto out_destroy_xfsdatad_workqueue;