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

[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  4e903f43d02fdd14ab8eaa970daa15cb70fe4510 (commit)
      from  e941db48a032fb614ebbbdfe59947a9e5e3534cb (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 4e903f43d02fdd14ab8eaa970daa15cb70fe4510
Author: Marko Obrovac <mar...@in...>
Date:   Wed Jan 13 14:21:53 2010 +0000

    Add another argument to import/export functions used inside the
    iolinker_struct structure.

diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c
index b66bd6c..56d14eb 100644
--- a/fs/kdfs/address_space.c
+++ b/fs/kdfs/address_space.c
@@ -13,6 +13,8 @@
 
 #include <linux/pagemap.h>
 
+#include <net/krgrpc/rpc.h>
+#include <net/krgrpc/rpcid.h>
 #include <kddm/kddm.h>
 
 #include "super.h"
@@ -632,7 +634,8 @@ 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,
 			struct kddm_set *set,
 			struct kddm_obj *objEntry,
-			objid_t objid)
+			objid_t objid,
+			int flags)
 {
 	struct kdfs_page *k_page = (struct kdfs_page *)objEntry->object;
 	int res = 0;
@@ -694,7 +697,8 @@ int kdfs_iol_page_invalidate(kddm_obj_t *objEntry, kddm_set_t *set, objid_t obji
 int kdfs_iol_page_import(struct rpc_desc *desc,
 			struct kddm_set *set,
 			struct kddm_obj *objEntry,
-			objid_t objid)
+			objid_t objid,
+			int flags)
 {
 	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 491695c..894a5fc 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, struct kddm_set *set, struct kddm_obj *obj_entry, objid_t objid);
+int kdfs_iol_page_export (struct rpc_desc *desc, struct kddm_set *set, struct kddm_obj *obj_entry, objid_t objid, int flags);
 int kdfs_iol_page_invalidate(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid);
-int kdfs_iol_page_import (struct rpc_desc *desc, struct kddm_set *set, struct kddm_obj *objEntry, objid_t objid);
+int kdfs_iol_page_import (struct rpc_desc *desc, struct kddm_set *set, struct kddm_obj *objEntry, objid_t objid, int flags);
 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 c6d2e67..90250e2 100644
--- a/fs/kdfs/inode.c
+++ b/fs/kdfs/inode.c
@@ -11,6 +11,8 @@
  *  Copyright (C) 2006-2007, XtreemOS Consortium.
  */
 
+#include <net/krgrpc/rpc.h>
+#include <net/krgrpc/rpcid.h>
 #include <kddm/kddm.h>
 
 #include "super.h"
@@ -1181,7 +1183,8 @@ int kdfs_iol_inode_first_touch(kddm_obj_t *objEntry,
 int kdfs_iol_inode_export_object(struct rpc_desc *desc,
 			struct kddm_set *set,
 			struct kddm_obj *objEntry,
-			objid_t objid)
+			objid_t objid,
+			int flags)
 {
 	struct kdfs_inode *src = (struct kdfs_inode *) objEntry->object;
 	struct kdfs_netinode net_dest;
@@ -1206,7 +1209,8 @@ int kdfs_iol_inode_export_object(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)
+			objid_t objid,
+			int flags)
 {
 	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 8eabce5..ee51d2c 100644
--- a/fs/kdfs/super.c
+++ b/fs/kdfs/super.c
@@ -17,6 +17,8 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+#include <net/krgrpc/rpc.h>
+#include <net/krgrpc/rpcid.h>
 #include <kddm/kddm.h>
 
 #include "physical_fs.h"
@@ -1888,7 +1890,8 @@ static inline void __kdfs_import_kdfs_cwsb(struct kdfs_cw_sb *dest, struct kdfs_
 int kdfs_iol_sb_export(struct rpc_desc *desc,
 			struct kddm_set *set,
 			struct kddm_obj *objEntry,
-			objid_t objid)
+			objid_t objid,
+			int flags)
 {
 	struct kdfs_cw_sb *k_cw_sb = NULL;
 	struct kdfs_super_block *k_sb = NULL;
@@ -1946,7 +1949,8 @@ int kdfs_iol_sb_export(struct rpc_desc *desc,
 int kdfs_iol_sb_import (struct rpc_desc *desc,
 			struct kddm_set *set,
 			struct kddm_obj *objEntry,
-			objid_t objid)
+			objid_t objid,
+			int flags)
 {
 	int res = 0;
 	struct kdfs_generic_sb *kgsb = objEntry->object;

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

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


hooks/post-receive
-- 
kdfs