ryantimwilson / rpms / systemd

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