[PATCH] quota: integer constant is too large for ‘long’ type in

[PATCH] quota: integer constant is too large for ‘long’ type in

[Jerry Leo]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

Hi, Jan Kara,

the Patch is for this:

CC      fs/quota/quota_v2.o
fs/quota/quota_v2.c: In function ‘v2_read_file_info’:
fs/quota/quota_v2.c:123: warning: integer constant is too large for ‘long’ type
fs/quota/quota_v2.c:124: warning: integer constant is too large for ‘long’ type


Can this patch be fixed?


diff --git a/linux-2.6/fs/quota/quota_v2.c.orig b/linux-2.6/fs/quota/quota_v2.c
index 3dfc23e..be9ea1e 100644
--- a/linux-2.6/fs/quota/quota_v2.c.orig
+++ b/linux-2.6/fs/quota/quota_v2.c
@@ -120,8 +120,8 @@ static int v2_read_file_info(struct super_block
*sb, int type)
                info->dqi_maxilimit = 0xffffffff;
        } else {
                /* used space is stored as unsigned 64-bit value */
-               info->dqi_maxblimit = 0xffffffffffffffff;       /* 2^64-1 */
-               info->dqi_maxilimit = 0xffffffffffffffff;
+               info->dqi_maxblimit = 0xFFFFFFFFFFFFFFFFLL;     /* 2^64-1 */
+               info->dqi_maxilimit = 0xFFFFFFFFFFFFFFFFLL;
        }
        info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
        info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);


Best Regards!

                                                                   JerryLeo

[-- Attachment #2: patch --]
[-- Type: application/octet-stream, Size: 691 bytes --]

diff --git a/linux-2.6/fs/quota/quota_v2.c.orig b/linux-2.6/fs/quota/quota_v2.c
index 3dfc23e..be9ea1e 100644
--- a/linux-2.6/fs/quota/quota_v2.c.orig
+++ b/linux-2.6/fs/quota/quota_v2.c
@@ -120,8 +120,8 @@ static int v2_read_file_info(struct super_block *sb, int type)
 		info->dqi_maxilimit = 0xffffffff;
 	} else {
 		/* used space is stored as unsigned 64-bit value */
-		info->dqi_maxblimit = 0xffffffffffffffff;	/* 2^64-1 */
-		info->dqi_maxilimit = 0xffffffffffffffff;
+		info->dqi_maxblimit = 0xFFFFFFFFFFFFFFFFLL;	/* 2^64-1 */
+		info->dqi_maxilimit = 0xFFFFFFFFFFFFFFFFLL;
 	}
 	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
 	info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);

Re: [PATCH] quota: integer constant is too large for ‘long’ type in

[Joe Perches]

On Tue, 2009-12-15 at 21:27 +0800, Jerry Leo wrote:
> -               info->dqi_maxblimit = 0xffffffffffffffff;       /* 2^64-1 */
> -               info->dqi_maxilimit = 0xffffffffffffffff;
> +               info->dqi_maxblimit = 0xFFFFFFFFFFFFFFFFLL;     /* 2^64-1 */
> +               info->dqi_maxilimit = 0xFFFFFFFFFFFFFFFFLL;

ULLONG_MAX?

Re: [PATCH] quota: integer constant is too large for ‘long’ type in

[Jan Kara]

On Tue 15-12-09 07:24:14, Joe Perches wrote:
> On Tue, 2009-12-15 at 21:27 +0800, Jerry Leo wrote:
> > -               info->dqi_maxblimit = 0xffffffffffffffff;       /* 2^64-1 */
> > -               info->dqi_maxilimit = 0xffffffffffffffff;
> > +               info->dqi_maxblimit = 0xFFFFFFFFFFFFFFFFLL;     /* 2^64-1 */
> > +               info->dqi_maxilimit = 0xFFFFFFFFFFFFFFFFLL;
> 
> ULLONG_MAX?
  Not quite - I want it to really be 2^64 - 1 (on disk type is u64)
so ULLONG_MAX would be confusing IMHO.

								Honza
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

Re: [PATCH] quota: integer constant is too large for ‘long’ type in

[Jan Kara]

On Tue 15-12-09 21:27:50, Jerry Leo wrote:
> Hi, Jan Kara,
> 
> the Patch is for this:
> 
> CC      fs/quota/quota_v2.o
> fs/quota/quota_v2.c: In function ‘v2_read_file_info’:
> fs/quota/quota_v2.c:123: warning: integer constant is too large for ‘long’ type
> fs/quota/quota_v2.c:124: warning: integer constant is too large for ‘long’ type
> 
> 
> Can this patch be fixed?
  Ops, yes. I didn't see these warnings because I'm using 64-bit
machines... Thanks for the fix. You actually have to use ULL as Joe pointed
out. So I've merged the patch below:

>From 0ec834cacfc98633133b5a90c951f2d02e341048 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 15 Dec 2009 22:24:36 +0100
Subject: [PATCH] quota: Fix 64-bit limits setting on 32-bit archs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix warnings:
fs/quota/quota_v2.c: In function ‘v2_read_file_info’:
fs/quota/quota_v2.c:123: warning: integer constant is too large for ‘long’ type
fs/quota/quota_v2.c:124: warning: integer constant is too large for ‘long’ type

Reported-by: Jerry Leo <jerryleo860202@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/quota/quota_v2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 3dfc23e..669855c 100644
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -120,8 +120,8 @@ static int v2_read_file_info(struct super_block *sb, int type)
 		info->dqi_maxilimit = 0xffffffff;
 	} else {
 		/* used space is stored as unsigned 64-bit value */
-		info->dqi_maxblimit = 0xffffffffffffffff;	/* 2^64-1 */
-		info->dqi_maxilimit = 0xffffffffffffffff;
+		info->dqi_maxblimit = 0xffffffffffffffffULL;	/* 2^64-1 */
+		info->dqi_maxilimit = 0xffffffffffffffffULL;
 	}
 	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
 	info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
-- 
1.6.4.2

-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR