richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 1ab30e0ea4b78ea20e64dccf729668d18a0fac51 Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Mon, 30 Mar 2015 14:42:02 +0200
803fb7
Subject: [PATCH] mount: don't run quotaon only for network filesystems
803fb7
803fb7
If you have for example ext4 on iscsi devices it is possible to setup
803fb7
qoutas there. Unfortunately, because such fstab entry contains _netdev,
803fb7
systemd will not add dependency to quotaon.service.
803fb7
803fb7
(cherry picked from commit 11041c8488e956924870379a9203d7f1cac3b038)
803fb7
803fb7
Cherry-picked from: f66964d
803fb7
Resolves: #1222517
803fb7
---
803fb7
 src/core/mount.c | 4 +++-
803fb7
 1 file changed, 3 insertions(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/core/mount.c b/src/core/mount.c
803fb7
index 3ae0eb462..335922025 100644
803fb7
--- a/src/core/mount.c
803fb7
+++ b/src/core/mount.c
803fb7
@@ -107,7 +107,9 @@ static bool mount_is_auto(const MountParameters *p) {
803fb7
 static bool needs_quota(const MountParameters *p) {
803fb7
         assert(p);
803fb7
 
803fb7
-        if (mount_is_network(p))
803fb7
+        /* Quotas are not enabled on network filesystems,
803fb7
+         * but we them, for example, on storages connected via iscsi */
803fb7
+        if (p->fstype && fstype_is_network(p->fstype))
803fb7
                 return false;
803fb7
 
803fb7
         if (mount_is_bind(p))