commit 5076564f251a0837c4e089c548356cec0093f246
Author: Jan Rękorajski <[email protected]>
Date: Tue Mar 29 09:25:29 2016 +0900
- started 4.5 (updated patches, TODO: config)
kernel-hostap.patch | 46 +++++-----
kernel-imq.patch | 2 +-
kernel-libata-ahci-pm.patch | 12 +--
kernel-small_fixes.patch | 209 --------------------------------------------
kernel.spec | 8 +-
5 files changed, 33 insertions(+), 244 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b63a0ae..67f737a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@
%define have_pcmcia 0
%endif
-%define rel 1
-%define basever 4.4
-%define postver .6
+%define rel 0.1
+%define basever 4.5
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -117,7 +117,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0:
http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
+# Source0-md5: a60d48eee08ec0536d5efb17ca819aef
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
# Patch0-md5: d48f09bf61f2500d70f839e190dc7c5a
diff --git a/kernel-hostap.patch b/kernel-hostap.patch
index 1afcbf2..32f6c24 100644
--- a/kernel-hostap.patch
+++ b/kernel-hostap.patch
@@ -1,6 +1,6 @@
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
2006-09-21 01:30:18.000000000 -0400
@@ -69,6 +69,9 @@
iface = netdev_priv(dev);
local = iface->local;
@@ -19,9 +19,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_80211_tx.c linux
iface->stats.tx_packets++;
iface->stats.tx_bytes += skb->len;
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_hw.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_hw.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_hw.c
2006-09-21 01:26:27.000000000 -0400
++++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_hw.c
2006-09-21 01:30:18.000000000 -0400
@@ -1005,6 +1005,35 @@
return fid;
}
@@ -88,10 +88,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.1
local->func->reset_port = prism2_reset_port;
local->func->schedule_reset = prism2_schedule_reset;
#ifdef PRISM2_DOWNLOAD_SUPPORT
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_hw.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
2006-09-21 01:30:18.000000000 -0400
@@ -1104,33 +1104,7 @@
printk(KERN_DEBUG "Enabling monitor mode\n");
@@ -136,9 +135,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.
else if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
!local->fw_encrypt_ok) {
printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_main.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_main.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_main.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_main.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_main.c
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_main.c
2006-09-21 01:30:18.000000000 -0400
@@ -331,7 +331,7 @@
if (local->iw_mode == IW_MODE_REPEAT)
return HFA384X_PORTTYPE_WDS;
@@ -148,10 +147,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_main.c linux-2.6
return HFA384X_PORTTYPE_HOSTAP;
}
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap:
hostap_main.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_pci.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_pci.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_pci.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_pci.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_pci.c
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_pci.c
2006-09-21 01:30:18.000000000 -0400
@@ -48,6 +48,8 @@
{ 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
/* Samsung MagicLAN SWL-2210P */
@@ -161,10 +159,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_pci.c linux-2.6.
{ 0 }
};
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap:
hostap_pci.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_plx.c
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_plx.c
2006-09-21 01:30:18.000000000 -0400
+diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_plx.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_plx.c
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_plx.c
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_plx.c
2006-09-21 01:30:18.000000000 -0400
@@ -101,6 +101,7 @@
{ 0xc250, 0x0002 } /* EMTAC A2424i */,
{ 0xd601, 0x0002 } /* Z-Com XI300 */,
@@ -173,10 +170,9 @@ diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_plx.c linux-2.6.
{ 0, 0}
};
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap:
hostap_plx.c.orig
-diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_wlan.h
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_wlan.h
---- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_wlan.h
2006-09-21 01:26:27.000000000 -0400
-+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_wlan.h
2006-09-21 01:30:18.000000000 -0400
+diff -ur
linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_wlan.h
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_wlan.h
+--- linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_wlan.h
2006-09-21 01:26:27.000000000 -0400
++++
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/intersil/hostap/hostap_wlan.h
2006-09-21 01:30:18.000000000 -0400
@@ -575,6 +575,7 @@
int (*hw_config)(struct net_device *dev, int initial);
void (*hw_reset)(struct net_device *dev);
diff --git a/kernel-imq.patch b/kernel-imq.patch
index be2a9c4..ceb1b6b 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1274,9 +1274,9 @@ index ae00b89..1cdcd02 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -137,6 +137,9 @@
- #include <linux/errqueue.h>
#include <linux/hrtimer.h>
#include <linux/netfilter_ingress.h>
+ #include <linux/sctp.h>
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+#include <linux/imq.h>
+#endif
diff --git a/kernel-libata-ahci-pm.patch b/kernel-libata-ahci-pm.patch
index 2ad5bdd..d22bb00 100644
--- a/kernel-libata-ahci-pm.patch
+++ b/kernel-libata-ahci-pm.patch
@@ -338,21 +338,23 @@ index f0c7120..fabcff4 100644
struct ahci_port_priv *pp = ap->private_data;
void __iomem *port_mmio = ahci_port_base(ap);
-@@ -701,9 +702,9 @@ static int ahci_set_lpm(struct ata_link *link, enum
ata_lpm_policy policy,
+@@ -701,10 +702,10 @@ static int ahci_set_lpm(struct ata_link *link, enum
ata_lpm_policy policy,
if (hpriv->cap & HOST_CAP_ALPM) {
u32 cmd = readl(port_mmio + PORT_CMD);
-+ cmd &= ~(PORT_CMD_ASP | PORT_CMD_ALPE);
++ if (!(hints & ATA_LPM_WAKE_ONLY))
++ cmd &= ~(PORT_CMD_ASP | PORT_CMD_ALPE);
if (policy == ATA_LPM_MAX_POWER || !(hints & ATA_LPM_HIPM)) {
-- cmd &= ~(PORT_CMD_ASP | PORT_CMD_ALPE);
+- if (!(hints & ATA_LPM_WAKE_ONLY))
+- cmd &= ~(PORT_CMD_ASP | PORT_CMD_ALPE);
cmd |= PORT_CMD_ICC_ACTIVE;
writel(cmd, port_mmio + PORT_CMD);
@@ -711,6 +712,13 @@ static int ahci_set_lpm(struct ata_link *link, enum
ata_lpm_policy policy,
- /* wait 10ms to be sure we've come out of LPM state */
- ata_msleep(ap, 10);
+ if (hints & ATA_LPM_WAKE_ONLY)
+ return 0;
+ } else if (policy == ATA_LPM_FIRMWARE_DEFAULTS) {
+ if (ppriv->init_alpe)
+ cmd |= PORT_CMD_ALPE;
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 1870865..d4b6034 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,212 +26,3 @@
exit
fi
done
-
-From: Dave Chinner <[email protected]>
-
-When we do dquot readahead in log recovery, we do not use a verifier
-as the underlying buffer may not have dquots in it. e.g. the
-allocation operation hasn't yet been replayed. Hence we do not want
-to fail recovery because we detect an operation to be replayed has
-not been run yet. This problem was addressed for inodes in commit
-d891400 ("xfs: inode buffers may not be valid during recovery
-readahead") but the problem was not recognised to exist for dquots
-and their buffers as the dquot readahead did not have a verifier.
-
-The result of not using a verifier is that when the buffer is then
-next read to replay a dquot modification, the dquot buffer verifier
-will only be attached to the buffer if *readahead is not complete*.
-Hence we can read the buffer, replay the dquot changes and then add
-it to the delwri submission list without it having a verifier
-attached to it. This then generates warnings in xfs_buf_ioapply(),
-which catches and warns about this case.
-
-Fix this and make it handle the same readahead verifier error cases
-as for inode buffers by adding a new readahead verifier that has a
-write operation as well as a read operation that marks the buffer as
-not done if any corruption is detected. Also make sure we don't run
-readahead if the dquot buffer has been marked as cancelled by
-recovery.
-
-This will result in readahead either succeeding and the buffer
-having a valid write verifier, or readahead failing and the buffer
-state requiring the subsequent read to resubmit the IO with the new
-verifier. In either case, this will result in the buffer always
-ending up with a valid write verifier on it.
-
-Note: we also need to fix the inode buffer readahead error handling
-to mark the buffer with EIO. Brian noticed the code I copied from
-there wrong during review, so fix it at the same time. Add comments
-linking the two functions that handle readahead verifier errors
-together so we don't forget this behavioural link in future.
-
-cc: <[email protected]> # 3.12 - current
-Signed-off-by: Dave Chinner <[email protected]>
-Reviewed-by: Brian Foster <[email protected]>
-Signed-off-by: Dave Chinner <[email protected]>
----
- fs/xfs/libxfs/xfs_dquot_buf.c | 36 ++++++++++++++++++++++++++++++------
- fs/xfs/libxfs/xfs_inode_buf.c | 2 ++
- fs/xfs/libxfs/xfs_quota_defs.h | 2 +-
- fs/xfs/libxfs/xfs_shared.h | 1 +
- fs/xfs/xfs_log_recover.c | 9 +++++++--
- 5 files changed, 41 insertions(+), 9 deletions(-)
-
-diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
-index 11cefb2..3cc3cf7 100644
---- a/fs/xfs/libxfs/xfs_dquot_buf.c
-+++ b/fs/xfs/libxfs/xfs_dquot_buf.c
-@@ -54,7 +54,7 @@ xfs_dqcheck(
- xfs_dqid_t id,
- uint type, /* used only when IO_dorepair is true */
- uint flags,
-- char *str)
-+ const char *str)
- {
- xfs_dqblk_t *d = (xfs_dqblk_t *)ddq;
- int errs = 0;
-@@ -207,7 +207,8 @@ xfs_dquot_buf_verify_crc(
- STATIC bool
- xfs_dquot_buf_verify(
- struct xfs_mount *mp,
-- struct xfs_buf *bp)
-+ struct xfs_buf *bp,
-+ int warn)
- {
- struct xfs_dqblk *d = (struct xfs_dqblk *)bp->b_addr;
- xfs_dqid_t id = 0;
-@@ -240,8 +241,7 @@ xfs_dquot_buf_verify(
- if (i == 0)
- id = be32_to_cpu(ddq->d_id);
-
-- error = xfs_dqcheck(mp, ddq, id + i, 0, XFS_QMOPT_DOWARN,
-- "xfs_dquot_buf_verify");
-+ error = xfs_dqcheck(mp, ddq, id + i, 0, warn, __func__);
- if (error)
- return false;
- }
-@@ -256,7 +256,7 @@ xfs_dquot_buf_read_verify(
-
- if (!xfs_dquot_buf_verify_crc(mp, bp))
- xfs_buf_ioerror(bp, -EFSBADCRC);
-- else if (!xfs_dquot_buf_verify(mp, bp))
-+ else if (!xfs_dquot_buf_verify(mp, bp, XFS_QMOPT_DOWARN))
- xfs_buf_ioerror(bp, -EFSCORRUPTED);
-
- if (bp->b_error)
-@@ -264,6 +264,25 @@ xfs_dquot_buf_read_verify(
- }
-
- /*
-+ * readahead errors are silent and simply leave the buffer as !done so a real
-+ * read will then be run with the xfs_dquot_buf_ops verifier. See
-+ * xfs_inode_buf_verify() for why we use EIO and ~XBF_DONE here rather than
-+ * reporting the failure.
-+ */
-+static void
-+xfs_dquot_buf_readahead_verify(
-+ struct xfs_buf *bp)
-+{
-+ struct xfs_mount *mp = bp->b_target->bt_mount;
-+
-+ if (!xfs_dquot_buf_verify_crc(mp, bp) ||
-+ !xfs_dquot_buf_verify(mp, bp, 0)) {
-+ xfs_buf_ioerror(bp, -EIO);
-+ bp->b_flags &= ~XBF_DONE;
-+ }
-+}
-+
-+/*
- * we don't calculate the CRC here as that is done when the dquot is flushed
to
- * the buffer after the update is done. This ensures that the dquot in the
- * buffer always has an up-to-date CRC value.
-@@ -274,7 +293,7 @@ xfs_dquot_buf_write_verify(
- {
- struct xfs_mount *mp = bp->b_target->bt_mount;
-
-- if (!xfs_dquot_buf_verify(mp, bp)) {
-+ if (!xfs_dquot_buf_verify(mp, bp, XFS_QMOPT_DOWARN)) {
- xfs_buf_ioerror(bp, -EFSCORRUPTED);
- xfs_verifier_error(bp);
- return;
-@@ -287,3 +306,8 @@ const struct xfs_buf_ops xfs_dquot_buf_ops = {
- .verify_write = xfs_dquot_buf_write_verify,
- };
-
-+const struct xfs_buf_ops xfs_dquot_buf_ra_ops = {
-+
-+ .verify_read = xfs_dquot_buf_readahead_verify,
-+ .verify_write = xfs_dquot_buf_write_verify,
-+};
-diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
-index ff17c48..1aabfda 100644
---- a/fs/xfs/libxfs/xfs_inode_buf.c
-+++ b/fs/xfs/libxfs/xfs_inode_buf.c
-@@ -68,6 +68,8 @@ xfs_inobp_check(
- * recovery and we don't get unnecssary panics on debug kernels. We use EIO
here
- * because all we want to do is say readahead failed; there is no-one to
report
- * the error to, so this will distinguish it from a non-ra verifier failure.
-+ * Changes to this readahead error behavour also need to be reflected in
-+ * xfs_dquot_buf_readahead_verify().
- */
- static void
- xfs_inode_buf_verify(
-diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
-index 1b0a083..f51078f 100644
---- a/fs/xfs/libxfs/xfs_quota_defs.h
-+++ b/fs/xfs/libxfs/xfs_quota_defs.h
-@@ -153,7 +153,7 @@ typedef __uint16_t xfs_qwarncnt_t;
- #define XFS_QMOPT_RESBLK_MASK (XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS)
-
- extern int xfs_dqcheck(struct xfs_mount *mp, xfs_disk_dquot_t *ddq,
-- xfs_dqid_t id, uint type, uint flags, char *str);
-+ xfs_dqid_t id, uint type, uint flags, const char *str);
- extern int xfs_calc_dquots_per_chunk(unsigned int nbblks);
-
- #endif /* __XFS_QUOTA_H__ */
-diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h
-index 5be5297..15c3ceb 100644
---- a/fs/xfs/libxfs/xfs_shared.h
-+++ b/fs/xfs/libxfs/xfs_shared.h
-@@ -49,6 +49,7 @@ extern const struct xfs_buf_ops xfs_inobt_buf_ops;
- extern const struct xfs_buf_ops xfs_inode_buf_ops;
- extern const struct xfs_buf_ops xfs_inode_buf_ra_ops;
- extern const struct xfs_buf_ops xfs_dquot_buf_ops;
-+extern const struct xfs_buf_ops xfs_dquot_buf_ra_ops;
- extern const struct xfs_buf_ops xfs_sb_buf_ops;
- extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops;
- extern const struct xfs_buf_ops xfs_symlink_buf_ops;
-diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
-index c5ecaac..5991cdc 100644
---- a/fs/xfs/xfs_log_recover.c
-+++ b/fs/xfs/xfs_log_recover.c
-@@ -3204,6 +3204,7 @@ xlog_recover_dquot_ra_pass2(
- struct xfs_disk_dquot *recddq;
- struct xfs_dq_logformat *dq_f;
- uint type;
-+ int len;
-
-
- if (mp->m_qflags == 0)
-@@ -3224,8 +3225,12 @@ xlog_recover_dquot_ra_pass2(
- ASSERT(dq_f);
- ASSERT(dq_f->qlf_len == 1);
-
-- xfs_buf_readahead(mp->m_ddev_targp, dq_f->qlf_blkno,
-- XFS_FSB_TO_BB(mp, dq_f->qlf_len), NULL);
-+ len = XFS_FSB_TO_BB(mp, dq_f->qlf_len);
-+ if (xlog_peek_buffer_cancelled(log, dq_f->qlf_blkno, len, 0))
-+ return;
-+
-+ xfs_buf_readahead(mp->m_ddev_targp, dq_f->qlf_blkno, len,
-+ &xfs_dquot_buf_ra_ops);
- }
-
- STATIC void
---
-2.5.0
-
-_______________________________________________
-xfs mailing list
[email protected]
-http://oss.sgi.com/mailman/listinfo/xfs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5076564f251a0837c4e089c548356cec0093f246
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
