Eric Sandeen wrote:
> Christoph Hellwig wrote:
>
>> On Sat, Oct 25, 2008 at 08:14:25AM -0500, Eric Sandeen wrote:
>>
>>> #ifdef CONFIG_DMAPI_DEBUG
>>> - printk("xfs_dm_round_hole: off %lu, len %ld, align %lu, "
>>> - "filesize %llu, roff %ld, rlen %ld\n",
>>> + printk("xfs_dm_round_hole: off %lld, len %llu, align %llu, "
>>> + "filesize %lld, roff %lld, rlen %llu\n",
>>> offset, length, align, filesize, *roff, *rlen);
>>>
>> We'd still need casts to (unsigned) long long because the 64 bit
>> types may be either variant on 64 bit platforms.
>>
> Ah crud you're right, I forgot that s64 was sometimes just a "long"
>
> Bah; is there no format that does this cleanly? :)
>
> -Eric
>
Fix up warnings when building with DMAPI_DEBUG
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
--
Index: linux-2.6-xfs/fs/xfs/dmapi/xfs_dm.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/dmapi/xfs_dm.c
+++ linux-2.6-xfs/fs/xfs/dmapi/xfs_dm.c
@@ -2334,9 +2334,11 @@ xfs_dm_round_hole(
return -EINVAL; /* requested length is too small */
}
#ifdef CONFIG_DMAPI_DEBUG
- printk("xfs_dm_round_hole: off %lu, len %ld, align %lu, "
- "filesize %llu, roff %ld, rlen %ld\n",
- offset, length, align, filesize, *roff, *rlen);
+ printk("xfs_dm_round_hole: off %lld, len %llu, align %llu, "
+ "filesize %lld, roff %lld, rlen %llu\n",
+ (long long)offset, (unsigned long long)length,
+ (unsigned long long)align, filesize, (long long)*roff,
+ (unsigned long long)*rlen);
#endif
return 0; /* hole geometry successfully rounded */
}
@@ -2467,8 +2469,9 @@ xfs_dm_punch_hole(
}
#ifdef CONFIG_DMAPI_DEBUG
- printk("xfs_dm_punch_hole: off %lu, len %ld, align %lu\n",
- off, len, align);
+ printk("xfs_dm_punch_hole: off %lld, len %llu, align %llu\n",
+ (long long)off, (unsigned long long)len,
+ (unsigned long long)align);
#endif
error = xfs_change_file_space(ip, XFS_IOC_UNRESVSP, &bf,
|