git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_buf.c
diff --git
a/fs/xfs/linux-2.6/xfs_buf.c
b/fs/xfs/linux-2.6/xfs_buf.c
index
ac1c7e8
..
5cb230f
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_buf.c
+++ b/
fs/xfs/linux-2.6/xfs_buf.c
@@
-401,9
+401,8
@@
_xfs_buf_lookup_pages(
* handle buffer allocation failures we can't do much.
*/
if (!(++retries % 100))
* 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);
__func__, gfp_mask);
XFS_STATS_INC(xb_page_retries);
@@
-615,8
+614,8
@@
xfs_buf_get(
if (!(bp->b_flags & XBF_MAPPED)) {
error = _xfs_buf_map_pages(bp, flags);
if (unlikely(error)) {
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;
}
}
goto no_buffer;
}
}
@@
-850,8
+849,8
@@
xfs_buf_get_uncached(
error = _xfs_buf_map_pages(bp, XBF_MAPPED);
if (unlikely(error)) {
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;
}
goto fail_free_mem;
}
@@
-1617,8
+1616,8
@@
xfs_setsize_buftarg_flags(
btp->bt_smask = sectorsize - 1;
if (set_blocksize(btp->bt_bdev, sectorsize)) {
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;
}
sectorsize, XFS_BUFTARG_NAME(btp));
return EINVAL;
}
@@
-2022,11
+2021,12
@@
xfs_buf_init(void)
if (!xfslogd_workqueue)
goto out_free_buf_zone;
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;
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;
if (!xfsconvertd_workqueue)
goto out_destroy_xfsdatad_workqueue;