Started working on ext3/linux quotactl command.

diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..23e5f25
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

diff --git a/configure.in b/configure.in
index f68db992432fb00e58313fa137045b548e13bae9..bfbb72132ffd180755aecd436f84bc883bc1f498 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,7 @@ AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen)
 AC_CHECK_FUNCS(strncasecmp strcasecmp strncmp)
 AC_CHECK_FUNCS(getfsent getvfsent listmntent)
 AC_FUNC_GETMNTENT
+AC_CHECK_FUNCS(quotactl)
 
 AC_MSG_CHECKING([for kernel type ($host_os)])
 case $host_os in

diff --git a/src/config.h.in b/src/config.h.in
index 77604deeaf62269c817abfb911f81669239d0209..501cc882895717a31a7f200ff7dde8d2df3433be 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -129,6 +129,9 @@
 /* Define to 1 if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H
 
+/* Define to 1 if you have the `quotactl' function. */
+#undef HAVE_QUOTACTL
+
 /* Define to 1 if you have the <rrd.h> header file. */
 #undef HAVE_RRD_H
 

diff --git a/src/quota_debug.h b/src/quota_debug.h
index dcbdcd466a6aa720120dcc3e35cccf8506b65e4d..0399a132c570ba606497481f577036ebf2991c91 100644 (file)
--- a/src/quota_debug.h
+++ b/src/quota_debug.h
@@ -27,6 +27,7 @@
 #include "common.h"
 
 #define QUOTA_PLUGIN_DEBUG 1
+#define QUOTA_PLUGIN_DEBUG_FILE "collectd_quota.log"
 
 #if QUOTA_PLUGIN_DEBUG
        #include <stdio.h>
@@ -43,7 +44,7 @@
        }
        #define DBG_INIT(...) \
        { \
-               QUOTA_DBG_FILE = fopen("collectd.log", "a"); \
+               QUOTA_DBG_FILE = fopen(QUOTA_PLUGIN_DEBUG_FILE, "a"); \
                if(QUOTA_DBG_FILE == NULL) { \
                        /* stderr is redirected to /dev/null, so you \
                           will not see anything */ \

diff --git a/src/quota_fs.c b/src/quota_fs.c
index bfd4d5ef327a12925c42bfe21186f1a8095edf78..bf22b90dd0c0f8f2915c3bce4f9bddb566872e22 100644 (file)
--- a/src/quota_fs.c
+++ b/src/quota_fs.c
@@ -23,8 +23,145 @@
 
 #include "common.h"
 #include "quota_debug.h"
+#include "quota_plugin.h"
+#include "quota_mnt.h"
 #include "quota_fs.h"
 
+/* *** *** ***   prototypes of local functions   *** *** *** */
+
+static int qft(const char *type);
+static void getquota_ext3(quota_t **quota, quota_mnt_t *m);
+static void getquota_ext2(quota_t **quota, quota_mnt_t *m);
+static void getquota_ufs(quota_t **quota, quota_mnt_t *m);
+static void getquota_vxfs(quota_t **quota, quota_mnt_t *m);
+static void getquota_zfs(quota_t **quota, quota_mnt_t *m);
+
+/* *** *** ***   local functions   *** *** *** */
+
+static int
+qft(const char *type)
+{
+       if(strcmp(type, "ext3") == 0) return QFT_EXT3;
+       if(strcmp(type, "ext2") == 0) return QFT_EXT2;
+       if(strcmp(type, "ufs")  == 0) return QFT_UFS;
+       if(strcmp(type, "vxfs") == 0) return QFT_VXFS;
+       if(strcmp(type, "zfs")  == 0) return QFT_ZFS;
+       return QFT_NONE;
+} /* static int qft(const char *type) */
+
+static void
+getquota_ext3(quota_t **quota, quota_mnt_t *m)
+{
+#if HAVE_QUOTACTL
+       int fmt;
+       if(quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&fmt) == -1) {
+               DBG("quotactl returned -1: %s", strerror(errno));
+               *quota = NULL;
+       }
+#endif
+#if 0
+       int kern_quota_on(const char *dev, int type, int fmt)
+{
+        /* Check whether quota is turned on... */
+        if (kernel_iface == IFACE_GENERIC) {
+                int actfmt;
+
+                if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0)
+                        return -1;
+                actfmt = kern2utilfmt(actfmt);
+                if (actfmt >= 0 && (fmt == -1 || (1 << actfmt) & fmt))
+                        return actfmt;
+                return -1;
+        }
+        if ((fmt & (1 << QF_VFSV0)) && v2_kern_quota_on(dev, type))     /* New quota format */
+                return QF_VFSV0;
+        if ((fmt & (1 << QF_XFS)) && xfs_kern_quota_on(dev, type))      /* XFS quota format */
+                return QF_XFS;
+        if ((fmt & (1 << QF_VFSOLD)) && v1_kern_quota_on(dev, type))    /* Old quota format */
+                return QF_VFSOLD;
+        return -1;
+}
+#endif
+
+
+#if 0
+       quotaio.c
+       kernfmt = kern_quota_on(h->qh_quotadev, type, fmt == -1 ? kernel_formats : (1 << fmt));
+                       if (kernfmt >= 0) {
+                        h->qh_io_flags |= IOFL_QUOTAON;
+                        fmt = kernfmt;  /* Default is kernel used format */
+                }
+if ((fmt = get_qf_name(mnt, type, (fmt == -1) ? ((1 << QF_VFSOLD) | (1 << QF_VFSV0)) : (1 << fmt),
+            (!QIO_ENABLED(h) || flags & IOI_OPENFILE) ? NF_FORMAT : 0, &qfname)) < 0) {
+errstr(_("Quota file not found or has wrong format.\n"));
+                goto out_handle;
+       if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) {  /* Need to open file? */
+                /* We still need to open file for operations like 'repquota' */
+                if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) {
+                        errstr(_("Can't open quotafile %s: %s\n"),
+                                qfname, strerror(errno));
+                        goto out_handle;
+                }
+                flock(fd, QIO_RO(h) ? LOCK_SH : LOCK_EX);
+                /* Init handle */
+                h->qh_fd = fd;
+                h->qh_fmt = fmt;
+        }
+        else {
+                h->qh_fd = -1;
+                h->qh_fmt = fmt;
+        }
+        free(qfname);   /* We don't need it anymore */
+        qfname = NULL;
+       if (h->qh_fmt == QF_VFSOLD)
+                h->qh_ops = &quotafile_ops_1;
+        else if (h->qh_fmt == QF_VFSV0)
+                h->qh_ops = &quotafile_ops_2;
+        memset(&h->qh_info, 0, sizeof(h->qh_info));
+
+        if (h->qh_ops->init_io && h->qh_ops->init_io(h) < 0) {
+                errstr(_("Can't initialize quota on %s: %s\n"), h->qh_quotadev, strerror(errno));
+                goto out_lock;
+        }
+        return h;
+out_lock:
+        if (fd != -1)
+                flock(fd, LOCK_UN);
+out_handle:
+        if (qfname)
+                free(qfname);
+        free(h);
+       return NULL;
+#endif
+       *quota = NULL;
+}
+
+static void
+getquota_ext2(quota_t **quota, quota_mnt_t *m)
+{
+       *quota = NULL;
+}
+
+static void
+getquota_ufs(quota_t **quota, quota_mnt_t *m)
+{
+       *quota = NULL;
+}
+
+static void
+getquota_vxfs(quota_t **quota, quota_mnt_t *m)
+{
+       *quota = NULL;
+}
+
+static void
+getquota_zfs(quota_t **quota, quota_mnt_t *m)
+{
+       *quota = NULL;
+}
+
+/* *** *** ***   global functions   *** *** *** */
+
 int
 quota_fs_issupported(const char *fsname)
 {
@@ -52,3 +189,59 @@ quota_fs_isnfs(const char *fsname)
                return EXIT_FAILURE;
        }
 }
+
+void
+quota_fs_freequota(quota_t *quota)
+{
+       quota_t *q = quota, *prev = NULL;
+
+       while(q != NULL) {
+               while(q->next != NULL) {
+                       prev = q;
+                       q = q->next;
+               }
+               if(prev != NULL) {
+                       prev->next = NULL;
+               }
+               free(q->type);
+               free(q->name);
+               free(q->dir);
+               free(q);
+               prev = NULL;
+               if(q != quota) {
+                       q = quota;
+               } else {
+                       q = NULL;
+               }
+       } /* while(q != NULL) */
+} /* void quota_fs_freequota(quota_t *quota) */
+
+quota_t *
+quota_fs_getquota(quota_t **quota, quota_mnt_t *mnt)
+{
+       quota_mnt_t *m = mnt;
+
+       while(m != NULL) {
+               switch(qft(m->type)) {
+                 case QFT_EXT3:
+                       getquota_ext3(quota, m);
+                       break;
+                 case QFT_EXT2:
+                       getquota_ext2(quota, m);
+                       break;
+                 case QFT_UFS:
+                       getquota_ufs(quota, m);
+                       break;
+                 case QFT_VXFS:
+                       getquota_vxfs(quota, m);
+                       break;
+                 case QFT_ZFS:
+                       getquota_zfs(quota, m);
+                       break;
+               }
+               m = m->next;
+       } /* while(l != NULL) */
+
+       return(*quota);
+}
+

diff --git a/src/quota_fs.h b/src/quota_fs.h
index 445b23d6fd9f1704218b2ae75b7a1612875cba3c..2bb05e978544286ded65315e0b064db18d717afc 100644 (file)
--- a/src/quota_fs.h
+++ b/src/quota_fs.h
@@ -25,9 +25,23 @@
 #define COLLECTD_QUOTA_FS_H 1
 
 #include "common.h"
+#include "quota_plugin.h"
+#include "quota_mnt.h"
+
+/* Quota Filesystem Type */
+#define QFT_NONE (0)
+#define QFT_EXT2 (1)
+#define QFT_EXT3 (2)
+#define QFT_XFS  (3)
+#define QFT_UFS  (4)
+#define QFT_VXFS (5)
+#define QFT_ZFS  (6)
 
 int quota_fs_issupported(const char *fsname);
 int quota_fs_isnfs(const char *fsname);
 
+quota_t *quota_fs_getquota(quota_t **quota, quota_mnt_t *m);
+void quota_fs_freequota(quota_t *quota);
+
 #endif /* !COLLECTD_QUOTA_FS_H */
 

diff --git a/src/quota_mnt.c b/src/quota_mnt.c
index fec543d60520e101264d3f835d121904724f5370..c2ab30353654850b7f4d8e223888bdd0859d4c22 100644 (file)
--- a/src/quota_mnt.c
+++ b/src/quota_mnt.c
@@ -380,40 +380,6 @@ get_device_name(const char *item)
        return rc;
 }
 
-/*
- *      Check whether give filesystem type is supported
- */
-static int
-correct_fstype(char *type)
-{
-       char *mtype = sstrdup(type), *next;
-
-       type = mtype;
-       do {
-               next = strchr(type, ',');
-               if(next) {
-                       *next = 0;
-               }
-               if(!strcmp(type, MNTTYPE_EXT2)
-               || !strcmp(type, MNTTYPE_EXT3)
-               || !strcmp(type, MNTTYPE_JFS)
-               || !strcmp(type, MNTTYPE_MINIX)
-               || !strcmp(type, MNTTYPE_UFS)
-               || !strcmp(type, MNTTYPE_UDF)
-               || !strcmp(type, MNTTYPE_REISER)
-               || !strcmp(type, MNTTYPE_XFS)
-               || !strcmp(type, MNTTYPE_NFS)
-               || !strcmp(type, MNTTYPE_NFS4))
-               {
-                       free(mtype);
-                       return 1;
-               }
-               type = next+1;
-       } while(next);
-       free(mtype);
-       return 0;
-}
-
 /*
  *      Check for various kinds of NFS filesystem
  */
@@ -427,7 +393,8 @@ nfs_fstype(char *type)
 /*
  *      Check for XFS filesystem with quota accounting enabled
  */
-static int hasxfsquota(struct mntent *mnt, int type)
+static int
+hasxfsquota(struct mntent *mnt, int type)
 {
        int ret = 0;
        u_int16_t sbflags;
@@ -528,17 +495,33 @@ quota_mnt_getmntent(FILE *mntf, quota_mnt_t **list)
                        free((char *)devname);
                        continue;
                }
-               if(hasmntopt(mnt, MNTOPT_QUOTA) == NULL
-               && hasmntopt(mnt, MNTOPT_USRQUOTA) == NULL
-               && hasmntopt(mnt, MNTOPT_GRPQUOTA) == NULL
-               && quota_fs_isnfs(mnt->mnt_type) == EXIT_FAILURE)
-               {
-                       DBG("neither quota/usrquota/grpquota option"
-                               " nor nfs fs (%s) %s (%s): ignored",
-                               mnt->mnt_type, mnt->mnt_dir, mnt->mnt_fsname);
-                       free((char *)devname);
-                       continue;
+#if HAVE_XFS_XQM_H
+               if(!strcmp(mnt->mnt_type, MNTTYPE_XFS)) {
+                       if(hasxfsquota(mnt, USRQUOTA) == 0
+                       && hasxfsquota(mnt, GRPQUOTA) == 0)
+                       {
+                               DBG("no quota on fs (%s) %s (%s): ignored",
+                                       mnt->mnt_type, mnt->mnt_dir,
+                                       mnt->mnt_fsname);
+                               free((char *)devname);
+                               continue;
+                       }
+               } else {
+#endif /* HAVE_XFS_XQM_H */
+                       if(hasmntopt(mnt, MNTOPT_QUOTA) == NULL
+                       && hasmntopt(mnt, MNTOPT_USRQUOTA) == NULL
+                       && hasmntopt(mnt, MNTOPT_GRPQUOTA) == NULL
+                       && quota_fs_isnfs(mnt->mnt_type) == EXIT_FAILURE)
+                       {
+                               DBG("neither quota/usrquota/grpquota option"
+                                       " nor nfs fs (%s) %s (%s): ignored",
+                                       mnt->mnt_type, mnt->mnt_dir, mnt->mnt_fsname);
+                               free((char *)devname);
+                               continue;
+                       }
+#if HAVE_XFS_XQM_H
                }
+#endif /* HAVE_XFS_XQM_H */
                if(quota_fs_issupported(mnt->mnt_type) == EXIT_FAILURE)
                {
                        DBG("unsupportet fs (%s) %s (%s): ignored",
@@ -552,7 +535,11 @@ quota_mnt_getmntent(FILE *mntf, quota_mnt_t **list)
                *list = (quota_mnt_t *)smalloc(sizeof(quota_mnt_t));
                (*list)->dir = sstrdup(mnt->mnt_dir);
                (*list)->device = sstrdup(mnt->mnt_fsname);
+               (*list)->type = sstrdup(mnt->mnt_type);
                (*list)->opts = QMO_NONE;
+/* TODO: this is not sufficient for XFS! */
+/* TODO: maybe we should anyway NOT rely on the option in the mountfile...
+   ... maybe the fs should be asked direktly all time! */
                if(hasmntopt(mnt, MNTOPT_QUOTA) != NULL
                || hasmntopt(mnt, MNTOPT_USRQUOTA) != NULL) {
                        (*list)->opts |= QMO_USRQUOTA;
@@ -672,6 +659,6 @@ quota_mnt_freelist(quota_mnt_t *list)
                } else {
                        l = NULL;
                }
-       }
-}
+       } /* while(l != NULL) */
+} /* void quota_mnt_freelist(quota_mnt_t *list) */
 

diff --git a/src/quota_mnt.h b/src/quota_mnt.h
index 9d98886c648730fbe30e7053051203388f6a395e..faa37608990ef8ddff8cf2fd59975d7da7b29fae 100644 (file)
--- a/src/quota_mnt.h
+++ b/src/quota_mnt.h
@@ -26,6 +26,7 @@
 
 #include "common.h"
 
+/* Quota Mount Options */
 #define QMO_NONE     (0)
 #define QMO_USRQUOTA (1)
 #define QMO_GRPQUOTA (2)
@@ -34,6 +35,7 @@ typedef struct _quota_mnt_t quota_mnt_t;
 struct _quota_mnt_t {
        char *dir;
        char *device;
+       char *type;
        int opts;
        quota_mnt_t *next;
 };

diff --git a/src/quota_plugin.c b/src/quota_plugin.c
index 15d772cf3ad7044850dab84f0f666903ea031b9f..c00dabb63598e22771635c5539bed9f2a2c3066c 100644 (file)
--- a/src/quota_plugin.c
+++ b/src/quota_plugin.c
@@ -85,12 +85,16 @@ static void
 quota_read(void)
 {
        quota_mnt_t *list = NULL, *l = NULL;
-       quota_t q = {
-               name: "test",
+       quota_t *quota = NULL, *q = NULL;
+       quota_t q_def = {
+               type: "usrquota",
+               name: "500",
+               dir: "/",
                blocks: 0, bquota: -1, blimit: -1,
                bgrace: 0, btimeleft: 0,
                inodes: 0, iquota: -1, ilimit: -1,
                igrace: 0, itimeleft: 0,
+               next: NULL,
        };
 
        l = quota_mnt_getlist(&list);
@@ -111,7 +115,29 @@ quota_read(void)
                }
        }
        DBG("\t== ");
-       quota_submit(&q);
+
+       q = quota_fs_getquota(&quota, list);
+       DBG("quotas:");
+       while(q != NULL) {
+               DBG("\ttype: %s", q->type);
+               DBG("\tname: %s", q->name);
+               DBG("\tdir: %s", q->dir);
+               DBG("\tblocks: %llu (%lld/%lld) %llu %llu",
+                       q->blocks, q->bquota, q->blimit,
+                       q->bgrace, q->btimeleft);
+               DBG("\tinodes: %llu (%lld/%lld) %llu %llu",
+                       q->inodes, q->iquota, q->ilimit,
+                       q->igrace, q->itimeleft);
+               q = q->next;
+               if(q != NULL) {
+                       DBG("\t-- ");
+               }
+       }
+       DBG("\t== ");
+
+       quota_submit(&q_def);
+
+       quota_fs_freequota(quota);
        quota_mnt_freelist(list);
 }
 

diff --git a/src/quota_plugin.h b/src/quota_plugin.h
index 785a51f0d1958a6da6da690a1c2512b876ea767c..063cd09f6cc43ecaec55aa8b453f5f39f51bbcae 100644 (file)
--- a/src/quota_plugin.h
+++ b/src/quota_plugin.h
@@ -26,15 +26,19 @@
 
 #include "common.h"
 
-typedef struct {
+typedef struct _quota_t quota_t;
+struct _quota_t {
+       char *type;
        char *name;
+       char *dir;
        unsigned long long blocks;
        long long bquota, blimit;
        unsigned long long bgrace, btimeleft;
        unsigned long long inodes;
        long long iquota, ilimit;
        unsigned long long igrace, itimeleft;
-} quota_t;
+       quota_t *next;
+};
 
 void module_register(void);