[PATCH] Large disk support for XFS

[PATCH] Large disk support for XFS

[Bean]

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

Hi,

This patch fixes a few size limits of xfs fs.

-- 
Bean

gitgrub home: http://github.com/grub/grub/
my fork page: http://github.com/bean123/grub/

[-- Attachment #2: xfs.diff --]
[-- Type: text/x-patch, Size: 1445 bytes --]

diff --git a/fs/xfs.c b/fs/xfs.c
index a143b55..1b18bef 100644
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -160,13 +160,13 @@ static grub_dl_t my_mod;
 #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 @@ static grub_dl_t my_mod;
 #define GRUB_XFS_NEXT_DIRENT(pos,len)		\
   (pos) + GRUB_XFS_ROUND_TO_DIRENT (8 + 1 + len + 2)
 \f
-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 @@ static grub_err_t
 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.  */

Re: [PATCH] Large disk support for XFS

[Vladimir 'phcoder' Serbinenko]

On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
> Hi,
>
> This patch fixes a few size limits of xfs fs.
>
For sector numbers I would recommend to use grub_disk_addr_t but
otherwise the patch looks good. Provided you write a Changelog and it
passes the test, I'm ok with you comitting it.
> --
> Bean
>
> gitgrub home: http://github.com/grub/grub/
> my fork page: http://github.com/bean123/grub/
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>
>



-- 
Regards
Vladimir 'phcoder' Serbinenko

Personal git repository: http://repo.or.cz/w/grub2/phcoder.git

Re: [PATCH] Large disk support for XFS

[Robert Millan]

On Sun, Aug 16, 2009 at 09:49:11PM +0200, Vladimir 'phcoder' Serbinenko wrote:
> On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
> > Hi,
> >
> > This patch fixes a few size limits of xfs fs.
> >
> For sector numbers I would recommend to use grub_disk_addr_t but
> otherwise the patch looks good. Provided you write a Changelog and it
> passes the test, I'm ok with you comitting it.

Ack.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

Re: [PATCH] Large disk support for XFS

[Vladimir 'phcoder' Serbinenko]

On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
> Hi,
>
> This patch fixes a few size limits of xfs fs.
Ping
>
> --
> Bean
>
> gitgrub home: http://github.com/grub/grub/
> my fork page: http://github.com/bean123/grub/
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>
>



-- 
Regards
Vladimir 'phcoder' Serbinenko

Personal git repository: http://repo.or.cz/w/grub2/phcoder.git

Re: [PATCH] Large disk support for XFS

[Robert Millan]

On Mon, Aug 24, 2009 at 09:14:48PM +0200, Vladimir 'phcoder' Serbinenko wrote:
> On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
> > Hi,
> >
> > This patch fixes a few size limits of xfs fs.
> Ping

Isn't this already in SVN ?

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

Re: [PATCH] Large disk support for XFS

[Vladimir 'phcoder' Serbinenko]

On Tue, Aug 25, 2009 at 12:30 AM, Robert Millan<rmh@aybabtu.com> wrote:
> On Mon, Aug 24, 2009 at 09:14:48PM +0200, Vladimir 'phcoder' Serbinenko wrote:
>> On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
>> > Hi,
>> >
>> > This patch fixes a few size limits of xfs fs.
>> Ping
>
> Isn't this already in SVN ?
>
No.
> --
> Robert Millan
>
>  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
>  how) you may access your data; but nobody's threatening your freedom: we
>  still allow you to remove your data and not access it at all."
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>



-- 
Regards
Vladimir 'phcoder' Serbinenko

Personal git repository: http://repo.or.cz/w/grub2/phcoder.git

Re: [PATCH] Large disk support for XFS

[Robert Millan]

On Tue, Aug 25, 2009 at 01:41:29AM +0200, Vladimir 'phcoder' Serbinenko wrote:
> On Tue, Aug 25, 2009 at 12:30 AM, Robert Millan<rmh@aybabtu.com> wrote:
> > On Mon, Aug 24, 2009 at 09:14:48PM +0200, Vladimir 'phcoder' Serbinenko wrote:
> >> On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
> >> > Hi,
> >> >
> >> > This patch fixes a few size limits of xfs fs.
> >> Ping
> >
> > Isn't this already in SVN ?
> >
> No.

Sorry, I confused it with another fix.

Bean, for obvious fixes like this one feel free to commit them right away
after waiting a short while, specially if it's been reviewed/okayed by
someone else.

Please go ahead with it, and next time please include a ChangeLog entry
when submitting patches.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

Re: [PATCH] Large disk support for XFS

[Bean]

Hi,

Ok, committed.

On Wed, Aug 26, 2009 at 8:18 AM, Robert Millan<rmh@aybabtu.com> wrote:
> On Tue, Aug 25, 2009 at 01:41:29AM +0200, Vladimir 'phcoder' Serbinenko wrote:
>> On Tue, Aug 25, 2009 at 12:30 AM, Robert Millan<rmh@aybabtu.com> wrote:
>> > On Mon, Aug 24, 2009 at 09:14:48PM +0200, Vladimir 'phcoder' Serbinenko wrote:
>> >> On Sun, Aug 16, 2009 at 9:46 PM, Bean<bean123ch@gmail.com> wrote:
>> >> > Hi,
>> >> >
>> >> > This patch fixes a few size limits of xfs fs.
>> >> Ping
>> >
>> > Isn't this already in SVN ?
>> >
>> No.
>
> Sorry, I confused it with another fix.
>
> Bean, for obvious fixes like this one feel free to commit them right away
> after waiting a short while, specially if it's been reviewed/okayed by
> someone else.
>
> Please go ahead with it, and next time please include a ChangeLog entry
> when submitting patches.
>
> --
> Robert Millan
>
>  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
>  how) you may access your data; but nobody's threatening your freedom: we
>  still allow you to remove your data and not access it at all."
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>



-- 
Bean

gitgrub home: http://github.com/grub/grub/
my fork page: http://github.com/bean123/grub/

Re: [PATCH] Large disk support for XFS

[Monty Montgomery]

After applying the patch, "grub-probe -v -t fs /" and "grub-install
/dev/sda" both succeed without incident on the 6TB XFS volume.
However, upon reboot:

GRUB loading.
Welcome to GRUB!

Entering rescue mode....
error: out of disk
grub rescue>

At this point I tried 'help' and was told:

Unknown command 'help'
Try 'help' for usage
grub rescue>

...so something still appears to be wrong (perhaps between chair and monitor?)

Thanks for the help thusfar,
Monty

Re: [PATCH] Large disk support for XFS

[Vladimir 'phcoder' Serbinenko]

On Mon, Aug 17, 2009 at 3:02 AM, Monty Montgomery<xiphmont@gmail.com> wrote:
> After applying the patch, "grub-probe -v -t fs /" and "grub-install
> /dev/sda" both succeed without incident on the 6TB XFS volume.
> However, upon reboot:
>
> GRUB loading.
> Welcome to GRUB!
>
> Entering rescue mode....
> error: out of disk
> grub rescue>
>
Looks like biosdisk is unable to access post-2TiB. Can you try with
ata.mod? (by adding --disk-module=ata to grub-install line)
> At this point I tried 'help' and was told:
>
> Unknown command 'help'
> Try 'help' for usage
> grub rescue>
>
> ...so something still appears to be wrong (perhaps between chair and monitor?)
>
> Thanks for the help thusfar,
> Monty
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>



-- 
Regards
Vladimir 'phcoder' Serbinenko

Personal git repository: http://repo.or.cz/w/grub2/phcoder.git

Re: [PATCH] Large disk support for XFS

[Robert Millan]

On Mon, Aug 17, 2009 at 12:09:03PM +0200, Vladimir 'phcoder' Serbinenko wrote:
> On Mon, Aug 17, 2009 at 3:02 AM, Monty Montgomery<xiphmont@gmail.com> wrote:
> > After applying the patch, "grub-probe -v -t fs /" and "grub-install
> > /dev/sda" both succeed without incident on the 6TB XFS volume.
> > However, upon reboot:
> >
> > GRUB loading.
> > Welcome to GRUB!
> >
> > Entering rescue mode....
> > error: out of disk
> > grub rescue>
> >
> Looks like biosdisk is unable to access post-2TiB. Can you try with
> ata.mod? (by adding --disk-module=ata to grub-install line)

biosdisk supports post-2TiB (I tested it).  But maybe his BIOS doesn't, of
course...

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

Re: [PATCH] Large disk support for XFS

[Monty Montgomery]

On Mon, Aug 17, 2009 at 6:09 AM, Vladimir 'phcoder'
Serbinenko<phcoder@gmail.com> wrote:
> On Mon, Aug 17, 2009 at 3:02 AM, Monty Montgomery<xiphmont@gmail.com> wrote:
>> After applying the patch, "grub-probe -v -t fs /" and "grub-install
>> /dev/sda" both succeed without incident on the 6TB XFS volume.
>> However, upon reboot:
>>
>> GRUB loading.
>> Welcome to GRUB!
>>
>> Entering rescue mode....
>> error: out of disk
>> grub rescue>
>>
> Looks like biosdisk is unable to access post-2TiB. Can you try with
> ata.mod? (by adding --disk-module=ata to grub-install line)

No go.  This reports:

GRUB loading.
Welcome to GRUB!

Entering rescue mode....
error: no such disk
grub rescue>

(this is a medium sized hardware RAID 6 configured to use LBA64)

Monty

Re: [PATCH] Large disk support for XFS

[Felix Zielcke]

Am Montag, den 17.08.2009, 15:22 -0400 schrieb Monty Montgomery:
> On Mon, Aug 17, 2009 at 6:09 AM, Vladimir 'phcoder'
> Serbinenko<phcoder@gmail.com> wrote:
> > On Mon, Aug 17, 2009 at 3:02 AM, Monty Montgomery<xiphmont@gmail.com> wrote:
> >> After applying the patch, "grub-probe -v -t fs /" and "grub-install
> >> /dev/sda" both succeed without incident on the 6TB XFS volume.
> >> However, upon reboot:
> >>
> >> GRUB loading.
> >> Welcome to GRUB!
> >>
> >> Entering rescue mode....
> >> error: out of disk
> >> grub rescue>
> >>
> > Looks like biosdisk is unable to access post-2TiB. Can you try with
> > ata.mod? (by adding --disk-module=ata to grub-install line)
> 
> No go.  This reports:
> 
> GRUB loading.
> Welcome to GRUB!
> 
> Entering rescue mode....
> error: no such disk
> grub rescue>

With `ls' you see all recognized disks.
But ata mod isn't that well tested so it could be it doestn't work for
you.