Updated kernel (2.6.27.41).

[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.suse / reiserfs-Use-sb_any_quota_loaded-instead-of-sb_an.patch

diff --git a/src/patches/suse-2.6.27.39/patches.suse/reiserfs-Use-sb_any_quota_loaded-instead-of-sb_an.patch b/src/patches/suse-2.6.27.39/patches.suse/reiserfs-Use-sb_any_quota_loaded-instead-of-sb_an.patch
deleted file mode 100644 (file)
index a7efb3e..0000000
--- a/src/patches/suse-2.6.27.39/patches.suse/reiserfs-Use-sb_any_quota_loaded-instead-of-sb_an.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Jan Kara <jack@suse.cz>
-References: fate#302681
-Subject: [PATCH 08/28] reiserfs: Use sb_any_quota_loaded() instead of sb_any_quota_enabled().
-Patch-mainline: 2.6.29?
-
-Signed-off-by: Jan Kara <jack@suse.cz>
----
- fs/reiserfs/super.c |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/fs/reiserfs/super.c
-+++ b/fs/reiserfs/super.c
-@@ -1002,8 +1002,7 @@ static int reiserfs_parse_options(struct
-               if (c == 'u' || c == 'g') {
-                       int qtype = c == 'u' ? USRQUOTA : GRPQUOTA;
- 
--                      if ((sb_any_quota_enabled(s) ||
--                           sb_any_quota_suspended(s)) &&
-+                      if (sb_any_quota_loaded(s) &&
-                           (!*arg != !REISERFS_SB(s)->s_qf_names[qtype])) {
-                               reiserfs_warning(s, "super-6511",
-                                                "cannot change journaled "
-@@ -1056,8 +1055,7 @@ static int reiserfs_parse_options(struct
-                                                "specified.");
-                               return 0;
-                       }
--                      if ((sb_any_quota_enabled(s) ||
--                           sb_any_quota_suspended(s)) &&
-+                      if (sb_any_quota_loaded(s) &&
-                           *qfmt != REISERFS_SB(s)->s_jquota_fmt) {
-                               reiserfs_warning(s, "super-6515",
-                                                "cannot change journaled "
-@@ -1084,7 +1082,7 @@ static int reiserfs_parse_options(struct
-       }
-       /* This checking is not precise wrt the quota type but for our purposes it is sufficient */
-       if (!(*mount_options & (1 << REISERFS_QUOTA))
--          && sb_any_quota_enabled(s)) {
-+          && sb_any_quota_loaded(s)) {
-               reiserfs_warning(s, "super-6516", "quota options must "
-                                "be present when quota is turned on.");
-               return 0;