Branch HEAD

b=18357
i=adilger
i=rread
o=simmonsja@ornl.gov

Make newer versions of gcc happy.

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index a2f2784..dea1edd 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -3503,7 +3503,7 @@ static int osc_statfs_interpret(const struct lu_env *env,
          * On very large disk, say 16TB 0.1% will be 16 GB. We don't want to
          * lose that amount of space so in those cases we report no space left
          * if their is less than 1 GB left.                             */
-        used = min((msfs->os_blocks - msfs->os_bfree) >> 10, 1ULL << 30);
+        used = min_t(__u64,(msfs->os_blocks - msfs->os_bfree) >> 10, 1 << 30);
         if (unlikely(((cli->cl_oscc.oscc_flags & OSCC_FLAG_NOSPC) == 0) &&
                      ((msfs->os_ffree < 32) || (msfs->os_bavail < used))))
                 cli->cl_oscc.oscc_flags |= OSCC_FLAG_NOSPC;