commit 347e232ecb5861cef718d1d7d069993d2331d171
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Nov 7 17:06:40 2014 +0100
- up to 3.16.7; this kernel line is EOL now; add xfs: avoid false
quotacheck after unclean shutdown
kernel-small_fixes.patch | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
kernel.spec | 4 +--
2 files changed, 94 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ecef12c..49b2206 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
%define rel 1
%define basever 3.16
-%define postver .6
+%define postver .7
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -116,7 +116,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 5c569ed649a0c9711879f333e90c5386
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: c83d2b26c8282e91b227f6810beb332e
+# Patch0-md5: 062f41ed40a33485605d98bad4bcc5a1
%endif
Source1: kernel.sysconfig
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b6034..603fe23 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,3 +26,95 @@
exit
fi
done
+commit 5ef828c4152726f56751c78ea844f08d2b2a4fa3
+Author: Eric Sandeen <[email protected]>
+Date: Mon Aug 4 11:35:44 2014 +1000
+
+ xfs: avoid false quotacheck after unclean shutdown
+
+ The commit
+
+ 83e782e xfs: Remove incore use of XFS_OQUOTA_ENFD and XFS_OQUOTA_CHKD
+
+ added a new function xfs_sb_quota_from_disk() which swaps
+ on-disk XFS_OQUOTA_* flags for in-core XFS_GQUOTA_* and XFS_PQUOTA_*
+ flags after the superblock is read.
+
+ However, if log recovery is required, the superblock is read again,
+ and the modified in-core flags are re-read from disk, so we have
+ XFS_OQUOTA_* flags in memory again. This causes the
+ XFS_QM_NEED_QUOTACHECK() test to be true, because the XFS_OQUOTA_CHKD
+ is still set, and not XFS_GQUOTA_CHKD or XFS_PQUOTA_CHKD.
+
+ Change xfs_sb_from_disk to call xfs_sb_quota_from disk and always
+ convert the disk flags to in-memory flags.
+
+ Add a lower-level function which can be called with "false" to
+ not convert the flags, so that the sb verifier can verify
+ exactly what was on disk, per Brian Foster's suggestion.
+
+ Reported-by: Cyril B. <[email protected]>
+ Signed-off-by: Eric Sandeen <[email protected]>
+
+diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c
+index f5ca028..8db9e92 100644
+--- a/fs/xfs/xfs_sb.c
++++ b/fs/xfs/xfs_sb.c
+@@ -386,10 +386,11 @@ xfs_sb_quota_from_disk(struct xfs_sb *sbp)
+ }
+ }
+
+-void
+-xfs_sb_from_disk(
++static void
++__xfs_sb_from_disk(
+ struct xfs_sb *to,
+- xfs_dsb_t *from)
++ xfs_dsb_t *from,
++ bool convert_xquota)
+ {
+ to->sb_magicnum = be32_to_cpu(from->sb_magicnum);
+ to->sb_blocksize = be32_to_cpu(from->sb_blocksize);
+@@ -445,6 +446,17 @@ xfs_sb_from_disk(
+ to->sb_pad = 0;
+ to->sb_pquotino = be64_to_cpu(from->sb_pquotino);
+ to->sb_lsn = be64_to_cpu(from->sb_lsn);
++ /* Convert on-disk flags to in-memory flags? */
++ if (convert_xquota)
++ xfs_sb_quota_from_disk(to);
++}
++
++void
++xfs_sb_from_disk(
++ struct xfs_sb *to,
++ xfs_dsb_t *from)
++{
++ __xfs_sb_from_disk(to, from, true);
+ }
+
+ static inline void
+@@ -560,7 +572,11 @@ xfs_sb_verify(
+ struct xfs_mount *mp = bp->b_target->bt_mount;
+ struct xfs_sb sb;
+
+- xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp));
++ /*
++ * Use call variant which doesn't convert quota flags from disk
++ * format, because xfs_mount_validate_sb checks the on-disk flags.
++ */
++ __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false);
+
+ /*
+ * Only check the in progress field for the primary superblock as
+diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
+index d5c44a6..5612aa8 100644
+--- a/fs/xfs/xfs_mount.c
++++ b/fs/xfs/xfs_mount.c
+@@ -324,7 +324,6 @@ reread:
+ * Initialize the mount structure from the superblock.
+ */
+ xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
+- xfs_sb_quota_from_disk(sbp);
+
+ /*
+ * If we haven't validated the superblock, do so now before we try
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/347e232ecb5861cef718d1d7d069993d2331d171
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
