backing out to version 208 of util-vserver

[util-vserver.git] / src / vdlimit.c

diff --git a/src/vdlimit.c b/src/vdlimit.c
index edb3f80..fc287e9 100644 (file)
--- a/src/vdlimit.c
+++ b/src/vdlimit.c
@@ -1,4 +1,4 @@
-// $Id: vdlimit.c,v 1.3 2007/01/18 15:28:28 mef Exp $    --*- c -*--
+// $Id: vdlimit.c,v 1.2 2005/08/21 22:16:22 mlhuang Exp $    --*- c -*--
 
 // Copyright (C) 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -21,6 +21,7 @@
 #endif
 
 #include "util.h"
+#include <lib_internal/sys_clone.h>
 #include <lib/internal.h>
 
 #include <vserver.h>
@@ -84,24 +85,14 @@ showVersion()
 static void
 setDlimit(char const *filename, xid_t xid, uint32_t flags, struct vc_ctx_dlimit const *limit)
 {
-  bool         was_added = false;
-
   if (vc_get_dlimit(filename, xid, flags, 0) == -1) {
     if (vc_add_dlimit(filename, xid, flags) == -1) {
       perror(ENSC_WRAPPERS_PREFIX "vc_add_dlimit()");
       exit(wrapper_exit_code);
     }
-
-    was_added = true;
   }
-
   if (vc_set_dlimit(filename, xid, flags, limit) == -1) {
     perror(ENSC_WRAPPERS_PREFIX "vc_set_dlimit()");
-
-    if (was_added &&
-       vc_rem_dlimit(filename, xid, flags)==-1)
-      perror(ENSC_WRAPPERS_PREFIX "vc_rem_dlimit()");
-
     exit(wrapper_exit_code);
   }
 }
@@ -209,14 +200,6 @@ setDLimitField(struct vc_ctx_dlimit *dst, char const *opt)
   return true;
 }
 
-bool
-isHigherLimit(uint_least32_t lhs, uint_least32_t rhs)
-{
-  if (lhs==VC_CDLIM_KEEP || rhs==VC_CDLIM_KEEP) return false;
-
-  return lhs > rhs;
-}
-
 int main(int argc, char *argv[])
 {
   bool         do_set       = false;
@@ -278,10 +261,6 @@ int main(int argc, char *argv[])
     WRITE_MSG(2, "No mount point specified; try '--help' for more information\n");
   else if (xid==VC_NOCTX)
     WRITE_MSG(2, "No xid specified; try '--help' for more information\n");
-  else if (isHigherLimit(limit.space_used, limit.space_total))
-    WRITE_MSG(2, "invalid parameters: 'space_used' is larger than 'space_total'\n");
-  else if (isHigherLimit(limit.inodes_used, limit.inodes_total))
-    WRITE_MSG(2, "invalid parameters: 'inodes_used' is larger than 'inodes_total'\n");
   else {
     for (; optind < argc; ++optind) {
       if      (do_set)     setDlimit(argv[optind], xid, flags, &limit);