Eliminate blkfront union member in struct file

Replace the blkfront specific union member in struct file with the
common dev pointer.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/blkfront.c b/blkfront.c
index 8137106b9f4124421b668ae78ee37c512439f553..e3f42bef48811318d6713c4bbb0720d9d3cc2c70 100644 (file)
--- a/blkfront.c
+++ b/blkfront.c
@@ -562,13 +562,13 @@ int blkfront_open(struct blkfront_dev *dev)
     }
     dev->fd = alloc_fd(FTYPE_BLK);
     printk("blk_open(%s) -> %d\n", dev->nodename, dev->fd);
-    files[dev->fd].blk.dev = dev;
+    files[dev->fd].dev = dev;
     return dev->fd;
 }
 
 int blkfront_posix_rwop(int fd, uint8_t* buf, size_t count, int write)
 {
-   struct blkfront_dev* dev = files[fd].blk.dev;
+   struct blkfront_dev* dev = files[fd].dev;
    off_t offset = files[fd].offset;
    struct blkfront_aiocb aiocb;
    unsigned long long disksize = dev->info.sectors * dev->info.sector_size;
@@ -718,7 +718,7 @@ int blkfront_posix_rwop(int fd, uint8_t* buf, size_t count, int write)
 
 int blkfront_posix_fstat(int fd, struct stat* buf)
 {
-   struct blkfront_dev* dev = files[fd].blk.dev;
+   struct blkfront_dev* dev = files[fd].dev;
 
    buf->st_mode = dev->info.mode;
    buf->st_uid = 0;

diff --git a/include/lib.h b/include/lib.h
index 60aaf1cdf86cccadb5862926985b475ab3a86391..3a40634c0c20878de0f8bdb223b41d3bb6075b9b 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -196,9 +196,6 @@ struct file {
        struct {
            struct netfront_dev *dev;
        } tap;
-       struct {
-           struct blkfront_dev *dev;
-       } blk;
        struct {
            struct kbdfront_dev *dev;
        } kbd;

diff --git a/lib/sys.c b/lib/sys.c
index 1da740189a3d39c0316e7c79463753248e1017c7..f2fdbdf6f73a0d746609a797b7124ad9cf28e121 100644 (file)
--- a/lib/sys.c
+++ b/lib/sys.c
@@ -456,7 +456,7 @@ int close(int fd)
 #endif
 #ifdef CONFIG_BLKFRONT
        case FTYPE_BLK:
-            shutdown_blkfront(files[fd].blk.dev);
+            shutdown_blkfront(files[fd].dev);
            files[fd].type = FTYPE_NONE;
            return 0;
 #endif