1 files changed, 2 insertions, 12 deletions

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 24b4ebea0d4d..d083889535a2 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -44,8 +44,6 @@
 
 static kmem_zone_t *xfs_buf_zone;
 
-static struct workqueue_struct *xfslogd_workqueue;
-
 #ifdef XFS_BUF_LOCK_TRACKING
 # define XB_SET_OWNER(bp)       ((bp)->b_last_holder = current->pid)
 # define XB_CLEAR_OWNER(bp)     ((bp)->b_last_holder = -1)
@@ -463,7 +461,7 @@ _xfs_buf_find(
          * have to check that the buffer falls within the filesystem bounds.
          */
         eofs = XFS_FSB_TO_BB(btp->bt_mount, btp->bt_mount->m_sb.sb_dblocks);
-        if (blkno >= eofs) {
+        if (blkno < 0 || blkno >= eofs) {
                 /*
                  * XXX (dgc): we should really be returning -EFSCORRUPTED here,
                  * but none of the higher level infrastructure supports
@@ -1053,7 +1051,7 @@ xfs_buf_ioend_async(
         struct xfs_buf  *bp)
 {
         INIT_WORK(&bp->b_iodone_work, xfs_buf_ioend_work);
-        queue_work(xfslogd_workqueue, &bp->b_iodone_work);
+        queue_work(bp->b_target->bt_mount->m_buf_workqueue, &bp->b_iodone_work);
 }
 
 void
@@ -1882,15 +1880,8 @@ xfs_buf_init(void)
         if (!xfs_buf_zone)
                 goto out;
 
-        xfslogd_workqueue = alloc_workqueue("xfslogd",
-                                WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_FREEZABLE, 1);
-        if (!xfslogd_workqueue)
-                goto out_free_buf_zone;
-
         return 0;
 
- out_free_buf_zone:
-        kmem_zone_destroy(xfs_buf_zone);
  out:
         return -ENOMEM;
 }
@@ -1898,6 +1889,5 @@ xfs_buf_init(void)
 void
 xfs_buf_terminate(void)
 {
-        destroy_workqueue(xfslogd_workqueue);
         kmem_zone_destroy(xfs_buf_zone);
 }