vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/osdep/linux/getroot.c: Add new btrfs defines.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-10-28 01:45:06 +01:00
parent 82591fa6e7
commit effe203677
2 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/linux/getroot.c: Add new btrfs defines.
2013-10-28 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-28 Vladimir Serbinenko <phcoder@gmail.com>
Make / in btrfs refer to real root, not the default volume. Make / in btrfs refer to real root, not the default volume.

35
grub-core/osdep/linux/getroot.c
View file

@ -49,7 +49,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <btrfs/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/raid/md_p.h> #include <linux/raid/md_p.h>
@ -60,7 +59,6 @@
#define LVM_DEV_MAPPER_STRING "/dev/mapper/" #define LVM_DEV_MAPPER_STRING "/dev/mapper/"
#if 0
/* Defines taken from btrfs/ioctl.h. */ /* Defines taken from btrfs/ioctl.h. */
struct btrfs_ioctl_dev_info_args struct btrfs_ioctl_dev_info_args
@ -81,11 +79,42 @@ struct btrfs_ioctl_fs_info_args
grub_uint64_t reserved[124]; grub_uint64_t reserved[124];
}; };
struct btrfs_ioctl_ino_lookup_args
{
grub_uint64_t treeid;
grub_uint64_t objectid;
char name[4080];
};
struct btrfs_ioctl_search_key
{
grub_uint64_t tree_id;
grub_uint64_t min_objectid;
grub_uint64_t max_objectid;
grub_uint64_t min_offset;
grub_uint64_t max_offset;
grub_uint64_t min_transid;
grub_uint64_t max_transid;
grub_uint32_t min_type;
grub_uint32_t max_type;
grub_uint32_t nr_items;
grub_uint32_t unused[9];
};
struct btrfs_ioctl_search_args {
struct btrfs_ioctl_search_key key;
char buf[4096 - sizeof(struct btrfs_ioctl_search_key)];
};
#define BTRFS_IOC_TREE_SEARCH _IOWR(0x94, 17, \
struct btrfs_ioctl_search_args)
#define BTRFS_IOC_INO_LOOKUP _IOWR(0x94, 18, \
struct btrfs_ioctl_ino_lookup_args)
#define BTRFS_IOC_DEV_INFO _IOWR(0x94, 30, \ #define BTRFS_IOC_DEV_INFO _IOWR(0x94, 30, \
struct btrfs_ioctl_dev_info_args) struct btrfs_ioctl_dev_info_args)
#define BTRFS_IOC_FS_INFO _IOR(0x94, 31, \ #define BTRFS_IOC_FS_INFO _IOR(0x94, 31, \
struct btrfs_ioctl_fs_info_args) struct btrfs_ioctl_fs_info_args)
#endif
static int static int
grub_util_is_imsm (const char *os_dev); grub_util_is_imsm (const char *os_dev);