[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2536] 2009-08-26 Bean <address@hidden>
From: |
Bean |
Subject: |
[2536] 2009-08-26 Bean <address@hidden> |
Date: |
Wed, 26 Aug 2009 14:17:34 +0000 |
Revision: 2536
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2536
Author: bean
Date: 2009-08-26 14:17:34 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
2009-08-26 Bean <address@hidden>
* fs/xfs.c (GRUB_XFS_INO_INOINAG): Replace 1L with 1LL to support
64-bit number.
(GRUB_XFS_FSB_TO_BLOCK): Likewise.
(grub_xfs_inode_block): Change return type to grub_uint64_t.
(grub_xfs_read_inode): Change type of block to grub_uint64_t.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/fs/xfs.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-08-26 00:32:57 UTC (rev 2535)
+++ trunk/grub2/ChangeLog 2009-08-26 14:17:34 UTC (rev 2536)
@@ -1,3 +1,11 @@
+2009-08-26 Bean <address@hidden>
+
+ * fs/xfs.c (GRUB_XFS_INO_INOINAG): Replace 1L with 1LL to support
+ 64-bit number.
+ (GRUB_XFS_FSB_TO_BLOCK): Likewise.
+ (grub_xfs_inode_block): Change return type to grub_uint64_t.
+ (grub_xfs_read_inode): Change type of block to grub_uint64_t.
+
2009-08-25 Vladimir Serbinenko <address@hidden>
NetBSD memory map support.
Modified: trunk/grub2/fs/xfs.c
===================================================================
--- trunk/grub2/fs/xfs.c 2009-08-26 00:32:57 UTC (rev 2535)
+++ trunk/grub2/fs/xfs.c 2009-08-26 14:17:34 UTC (rev 2536)
@@ -160,13 +160,13 @@
#define GRUB_XFS_INO_AGBITS(data) \
((data)->sblock.log2_agblk + (data)->sblock.log2_inop)
#define GRUB_XFS_INO_INOINAG(data, ino) \
- (grub_be_to_cpu64 (ino) & ((1 << GRUB_XFS_INO_AGBITS (data)) - 1))
+ (grub_be_to_cpu64 (ino) & ((1LL << GRUB_XFS_INO_AGBITS (data)) - 1))
#define GRUB_XFS_INO_AG(data,ino) \
(grub_be_to_cpu64 (ino) >> GRUB_XFS_INO_AGBITS (data))
#define GRUB_XFS_FSB_TO_BLOCK(data, fsb) \
(((fsb) >> (data)->sblock.log2_agblk) * (data)->agsize \
- + ((fsb) & ((1 << (data)->sblock.log2_agblk) - 1)))
+ + ((fsb) & ((1LL << (data)->sblock.log2_agblk) - 1)))
#define GRUB_XFS_EXTENT_OFFSET(exts,ex) \
((grub_be_to_cpu32 (exts[ex][0]) & ~(1 << 31)) << 23 \
@@ -185,7 +185,7 @@
#define GRUB_XFS_NEXT_DIRENT(pos,len) \
(pos) + GRUB_XFS_ROUND_TO_DIRENT (8 + 1 + len + 2)
-static inline int
+static inline grub_uint64_t
grub_xfs_inode_block (struct grub_xfs_data *data,
grub_uint64_t ino)
{
@@ -213,7 +213,7 @@
grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
struct grub_xfs_inode *inode)
{
- int block = grub_xfs_inode_block (data, ino);
+ grub_uint64_t block = grub_xfs_inode_block (data, ino);
int offset = grub_xfs_inode_offset (data, ino);
/* Read the inode. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2536] 2009-08-26 Bean <address@hidden>,
Bean <=