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

Flush block cache on adding disk to device map.

Browse source 
* grub-core/kern/emu/hostdisk.c (flush_initial_buffer): New function.
	(grub_hostdisk_os_dev_to_grub_drive): Call flush_initial_buffer on
	adding.
	(read_device_map): Likewise.
	(open_device): Flush on opening.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-11 21:03:47 +02:00
parent 690434e81d
commit f1a6254cf1
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2012-05-10 Vladimir Serbinenko <phcoder@gmail.com>
Flush block cache on adding disk to device map.
* grub-core/kern/emu/hostdisk.c (flush_initial_buffer): New function.
(grub_hostdisk_os_dev_to_grub_drive): Call flush_initial_buffer on
adding.
(read_device_map): Likewise.
(open_device): Flush on opening.
2012-05-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/cpio.c (grub_cpio_find_file): Handle prefix. * grub-core/fs/cpio.c (grub_cpio_find_file): Handle prefix.

24
grub-core/kern/emu/hostdisk.c
View file

@ -764,6 +764,21 @@ grub_util_fd_seek (int fd, const char *name, grub_uint64_t off)
} }
#endif #endif
static void
flush_initial_buffer (const char *os_dev __attribute__ ((unused)))
{
#ifdef __linux__
int fd;
struct stat st;
fd = open (os_dev, O_RDONLY);
if (fd >= 0 && fstat (fd, &st) >= 0 && S_ISBLK (st.st_mode))
ioctl (fd, BLKFLSBUF, 0);
if (fd >= 0)
close (fd);
#endif
}
const char * const char *
grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add) grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add)
{ {
@ -788,6 +803,8 @@ grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add)
strcpy (map[i].drive + sizeof ("hostdisk/") - 1, os_disk); strcpy (map[i].drive + sizeof ("hostdisk/") - 1, os_disk);
map[i].device_map = 0; map[i].device_map = 0;
flush_initial_buffer (os_disk);
return map[i].drive; return map[i].drive;
} }
@ -872,6 +889,11 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags,
data->dev = xstrdup (dev); data->dev = xstrdup (dev);
data->access_mode = (flags & O_ACCMODE); data->access_mode = (flags & O_ACCMODE);
data->fd = fd; data->fd = fd;
#ifdef __linux__
if (data->is_disk)
ioctl (data->fd, BLKFLSBUF, 0);
#endif
} }
if (is_partition) if (is_partition)
@ -1329,6 +1351,8 @@ read_device_map (const char *dev_map)
drive_e, map[drive].drive); drive_e, map[drive].drive);
*drive_p = c; *drive_p = c;
} }
flush_initial_buffer (map[drive].device);
} }
fclose (fp); fclose (fp);