quota-cvs-fixes.patch

   1 diff -urN quota-tools.org/quota.c quota-tools/quota.c
   2 --- quota-tools.org/quota.c     Fri May 31 18:01:16 2002
   3 +++ quota-tools/quota.c Fri May 31 17:59:37 2002
   4 @@ -173,7 +173,7 @@
   5                         iover = 1;
   6                 }
   7                 else if (q->dq_dqb.dqb_isoftlimit
   8 -                        && q->dq_dqb.dqb_curinodes >= q->dq_dqb.dqb_isoftlimit) {
   9 +                        && q->dq_dqb.dqb_curinodes > q->dq_dqb.dqb_isoftlimit) {
  10                         if (q->dq_dqb.dqb_itime > now) {
  11                                 msgi = _("In file grace period on");
  12                                 iover = 2;
  13 @@ -189,7 +189,7 @@
  14                                 bover = 1;
  15                 }
  16                 else if (q->dq_dqb.dqb_bsoftlimit
  17 -                        && toqb(q->dq_dqb.dqb_curspace) >= q->dq_dqb.dqb_bsoftlimit) {
  18 +                        && toqb(q->dq_dqb.dqb_curspace) > q->dq_dqb.dqb_bsoftlimit) {
  19                         if (q->dq_dqb.dqb_btime > now) {
  20                                 msgb = _("In block grace period on");
  21                                 bover = 2;
  22 diff -urN quota-tools.org/quotasys.c quota-tools/quotasys.c
  23 --- quota-tools.org/quotasys.c  Fri May 31 18:01:16 2002
  24 +++ quota-tools/quotasys.c      Fri May 31 17:59:38 2002
  25 @@ -371,7 +371,7 @@
  26                                 ret = quotafile_ops_1.check_file(fd, type);
  27                         close(fd);
  28                 }
  29 -               else if (errno != ENOENT)
  30 +               else if (errno != ENOENT && errno != EPERM)
  31                         errstr(_("Can't open quotafile %s: %s\n"), name, strerror(errno));
  32                 return ret;
  33         }
  34 @@ -520,6 +520,8 @@
  35         struct stat st;
  36
  37         kernel_formats = 0;
  38 +       if (!stat("/proc/fs/xfs/stat", &st))
  39 +               kernel_formats |= (1 << QF_XFS);
  40         if ((f = fopen(QSTAT_FILE, "r"))) {
  41                 /* Parse statistics file */
  42                 fgets(buf, sizeof(buf), f);
  43 @@ -545,8 +547,6 @@
  44                 struct v2_dqstats v2_stats;
  45                 struct sigaction sig, oldsig;
  46
  47 -               if (!stat("/proc/fs/xfs/stat", &st))
  48 -                       kernel_formats |= (1 << QF_XFS);
  49                 /* This signal handling is needed because old kernels send us SIGSEGV as they try to resolve the device */
  50                 sig.sa_handler = SIG_IGN;
  51                 sig.sa_sigaction = NULL;
  52