source: grub-pc/trunk/fuentes/debian/patches/zfs-mzap-lookup-argument-types.patch @ 22

Last change on this file since 22 was 22, checked in by mabarracus, 4 years ago

updated version and apply net.ifnames=0 into debian/rules
File size: 1.5 KB

  • grub-core/fs/zfs/zfs.c 

    From acc35f3fa2a9755a43ec5c4e83d58d88983634c1 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Feb 2015 16:22:01 +0100
Subject: zfs/mzap_lookup: Fix argument types

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=87a04adb6541c4bf169644bb2f84036a7c8558dd
Last-Update: 2016-01-22

Patch-Name: zfs-mzap-lookup-argument-types.patch
---
 grub-core/fs/zfs/zfs.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index e00a980..da8fd56 100644
    a b dmu_read (dnode_end_t * dn, grub_uint64_t blkid, void **buf, 
    20102010 */
    20112011static grub_err_t
    20122012mzap_lookup (mzap_phys_t * zapobj, grub_zfs_endian_t endian,
    2013              int objsize, const char *name, grub_uint64_t * value,
     2013             grub_uint16_t objsize, const char *name, grub_uint64_t * value,
    20142014             int case_insensitive)
    20152015{
    2016   int i, chunks;
     2016  grub_uint16_t i, chunks;
    20172017  mzap_ent_phys_t *mzap_ent = zapobj->mz_chunk;
    20182018
     2019  if (objsize < MZAP_ENT_LEN)
     2020    return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), name);
    20192021  chunks = objsize / MZAP_ENT_LEN - 1;
    20202022  for (i = 0; i < chunks; i++)
    20212023    {
    … … zap_lookup (dnode_end_t * zap_dnode, const char *name, grub_uint64_t *val, 
    24232425            struct grub_zfs_data *data, int case_insensitive)
    24242426{
    24252427  grub_uint64_t block_type;
    2426   int size;
     2428  grub_uint16_t size;
    24272429  void *zapbuf;
    24282430  grub_err_t err;
    24292431  grub_zfs_endian_t endian;
Note: See TracBrowser for help on using the repository browser.