[Kdfs-commits] [kernel]kdfs branch, make_kdfs_compile, updated. c6db9af7d662f1f6f50ec7da423000a11c1ad145

[Marko O. <d0...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kdfs".

The branch, make_kdfs_compile has been updated
       via  c6db9af7d662f1f6f50ec7da423000a11c1ad145 (commit)
      from  aac7aa4efd9eccdfbeaa04c04db7928e8b439110 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6db9af7d662f1f6f50ec7da423000a11c1ad145
Author: Marko Obrovac <mar...@in...>
Date:   Tue Jan 12 16:15:05 2010 +0000

    Bug fix:
     * fixed the rpc problem - turned out the definition of import/export
       functions in struct iolinker_struct had been changed, which caused
       a wrong pointer assignment.

diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c
index 27874db..ed65b57 100644
--- a/fs/kdfs/address_space.c
+++ b/fs/kdfs/address_space.c
@@ -632,7 +632,9 @@ int kdfs_iol_page_insert(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid)
  *  @param objid	Object id of the object
  */
 int kdfs_iol_page_export (struct rpc_desc *desc,
-		kddm_obj_t *objEntry)
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	struct kdfs_page *k_page = (struct kdfs_page *)objEntry->object;
 	int res = 0;
@@ -691,7 +693,10 @@ int kdfs_iol_page_invalidate(kddm_obj_t *objEntry, kddm_set_t *set, objid_t obji
  *  @param object    	The object to import data in.
  *  @param desc		Network descriptor exploited by rpc_pack()
  */
-int kdfs_iol_page_import(kddm_obj_t *objEntry, struct rpc_desc *desc)
+int kdfs_iol_page_import(struct rpc_desc *desc,
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	int res = 0;
 	struct kdfs_page *kdfs_page = (struct kdfs_page*) objEntry->object;
diff --git a/fs/kdfs/address_space.h b/fs/kdfs/address_space.h
index 5a7ac7a..491695c 100644
--- a/fs/kdfs/address_space.h
+++ b/fs/kdfs/address_space.h
@@ -112,9 +112,9 @@ void kdfs_mark_page_dirty(kddm_set_id_t set_id, objid_t obj_id);
 int kdfs_iol_page_alloc(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
 int kdfs_iol_page_first_touch(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid, int flags);
 int kdfs_iol_page_insert(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
-int kdfs_iol_page_export (struct rpc_desc *desc, kddm_obj_t *objEntry);
+int kdfs_iol_page_export (struct rpc_desc *desc, struct kddm_set *set, struct kddm_obj *obj_entry, objid_t objid);
 int kdfs_iol_page_invalidate(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
-int kdfs_iol_page_import (kddm_obj_t *objEntry, struct rpc_desc *desc);
+int kdfs_iol_page_import (struct rpc_desc *desc, struct kddm_set *set, struct kddm_obj *objEntry, objid_t objid);
 int kdfs_iol_page_sync(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
 int kdfs_iol_page_put(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
 int kdfs_iol_page_remove(void *object, struct kddm_set *set, objid_t objid);
diff --git a/fs/kdfs/inode.c b/fs/kdfs/inode.c
index 4cce701..bce1195 100644
--- a/fs/kdfs/inode.c
+++ b/fs/kdfs/inode.c
@@ -1181,7 +1181,9 @@ int kdfs_iol_inode_first_touch(kddm_obj_t *objEntry,
  *
  */
 int kdfs_iol_inode_export_object(struct rpc_desc *desc,
-		kddm_obj_t *objEntry)
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	struct kdfs_inode *src = (struct kdfs_inode *) objEntry->object;
 	struct kdfs_netinode net_dest;
@@ -1203,7 +1205,10 @@ int kdfs_iol_inode_export_object(struct rpc_desc *desc,
  *  @param object    	The object to import data in.
  *  @param desc		Network descriptor exploited by rpc_pack()
  */
-int kdfs_iol_inode_import_object(kddm_obj_t *objEntry, struct rpc_desc *desc)
+int kdfs_iol_inode_import_object(struct rpc_desc *desc,
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	int res = 0;
 	struct kdfs_inode *inode_dst = (struct kdfs_inode*) objEntry->object;
diff --git a/fs/kdfs/super.c b/fs/kdfs/super.c
index 747bb7e..ceba02e 100644
--- a/fs/kdfs/super.c
+++ b/fs/kdfs/super.c
@@ -1888,7 +1888,9 @@ static inline void __kdfs_import_kdfs_cwsb(struct kdfs_cw_sb *dest, struct kdfs_
  * @param objid		Identifier of the object in the kDDM set
  */
 int kdfs_iol_sb_export(struct rpc_desc *desc,
-		kddm_obj_t *objEntry)
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	struct kdfs_cw_sb *k_cw_sb = NULL;
 	struct kdfs_super_block *k_sb = NULL;
@@ -1943,8 +1945,10 @@ int kdfs_iol_sb_export(struct rpc_desc *desc,
  *  @param  object    	The object to import data in.
  *  @param desc		Network descriptor exploited by rpc_pack()
  */
-int kdfs_iol_sb_import (kddm_obj_t *objEntry,
-		struct rpc_desc *desc)
+int kdfs_iol_sb_import (struct rpc_desc *desc,
+			struct kddm_set *set,
+			struct kddm_obj *objEntry,
+			objid_t objid)
 {
 	int res = 0;
 	struct kdfs_generic_sb *kgsb = objEntry->object;

-----------------------------------------------------------------------

Summary of changes:
 fs/kdfs/address_space.c |    9 +++++++--
 fs/kdfs/address_space.h |    4 ++--
 fs/kdfs/inode.c         |    9 +++++++--
 fs/kdfs/super.c         |   10 +++++++---
 4 files changed, 23 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
kdfs