From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 17:09:42 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a281e2e80ad279b700416807cbacc10bb40b5d5d;p=thirdparty%2Fgrub.git

merge with mainline
---

a281e2e80ad279b700416807cbacc10bb40b5d5d
diff --cc disk/loopback.c
index 52929e765,509e9e33f..8153478ed
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@@ -71,11 -71,12 +71,12 @@@ delete_loopback (const char *name
  
  /* The command to add and remove loopback devices.  */
  static grub_err_t
 -grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
 +grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 -  struct grub_arg_list *state = state = cmd->state;
 +  struct grub_arg_list *state = ctxt->state;
    grub_file_t file;
    struct grub_loopback *newdev;
+   grub_err_t ret;
  
    if (argc < 1)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");