s3:vfs_gpfs: Check softquota before gracetime

gpfs_quotactl can return a non-zero softquota gracetime even when no
softquota has been set. This could lead to "disk full" being reported to
a client. The easiest fix is to check for a valid softquota before
checking the softquota gracetime.

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index a165cfadd84207245303d27fc73d096cd5c87fcc..ddd048acc0668722ad91fa1fb0899cce8b2417e3 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1562,7 +1562,8 @@ static void vfs_gpfs_disk_free_quota(struct gpfs_quotaInfo qi, time_t cur_time,
         * When the grace time for the exceeded soft block quota has been
         * exceeded, the soft block quota becomes an additional hard limit.
         */
-       if (qi.blockGraceTime && cur_time > qi.blockGraceTime) {
+       if (qi.blockSoftLimit &&
+           qi.blockGraceTime && cur_time > qi.blockGraceTime) {
                /* report disk as full */
                *dfree = 0;
                *dsize = MIN(*dsize, usage);