ChangeLog, Makefile.in, initialize.c, .del-io.h~72680822, openfs.c:

  Makefile.in (ELF_SO_VERSION): Bump version to be 2.4 since we've added
  	a new field to the io_channel (app_data).
  io.h: Add a new element to the io_channel structure, app_data.
  initialize.c, openfs.c: Set io->app_data to point at the filesystem handle.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 47ee666..e19ae74 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,13 @@
+Sat Aug 23 22:47:46 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (ELF_SO_VERSION): Bump version to be 2.4 since we've
+               added a new field to the io_channel (app_data).
+
+       * io.h: Add a new element to the io_channel structure, app_data.
+
+       * initialize.c, openfs.c: Set io->app_data to point at the
+               filesystem handle.
+
 Thu Aug 14 08:14:17 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * io.h: Change the prototype of ext2fs_llseek() to use int's

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index e9a0b3c..547f2a4 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -118,7 +118,7 @@ DLL_LIBS = -L../.. -lcom_err
 DLL_MYDIR = ext2fs
 DLL_INSTALL_DIR = $(libdir)
 
-ELF_VERSION = 2.3
+ELF_VERSION = 2.4
 ELF_SO_VERSION = 2
 ELF_IMAGE = libext2fs
 ELF_MYDIR = ext2fs

diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c
index 3e6028b..1537968 100644 (file)
--- a/lib/ext2fs/initialize.c
+++ b/lib/ext2fs/initialize.c
@@ -81,6 +81,7 @@ errcode_t ext2fs_initialize(const char *name, int flags,
        retval = manager->open(name, IO_FLAG_RW, &fs->io);
        if (retval)
                goto cleanup;
+       fs->io->app_data = fs;
        fs->device_name = malloc(strlen(name)+1);
        if (!fs->device_name) {
                retval = ENOMEM;

diff --git a/lib/ext2fs/io.h b/lib/ext2fs/io.h
index f40d56e..d20ebf0 100644 (file)
--- a/lib/ext2fs/io.h
+++ b/lib/ext2fs/io.h
@@ -46,6 +46,7 @@ struct struct_io_channel {
        int             refcount;
        int             reserved[15];
        void            *private_data;
+       void            *app_data;
 };
 
 struct struct_io_manager {

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 73a1da6..791ebe1 100644 (file)
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -63,6 +63,7 @@ errcode_t ext2fs_open(const char *name, int flags, int superblock,
                               &fs->io);
        if (retval)
                goto cleanup;
+       fs->io->app_data = fs;
        fs->device_name = malloc(strlen(name)+1);
        if (!fs->device_name) {
                retval = ENOMEM;