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

[alebre <al...@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  5a3bf8826dd301491d29a753c4b833ff46f1458e (commit)
      from  eeac43c259fa29f8f8595c6657e23c1fe3e291ea (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 5a3bf8826dd301491d29a753c4b833ff46f1458e
Author: ad <leb...@fr...>
Date:   Mon May 3 13:38:15 2010 +0000

    [MINOR] some forgot fixes

diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c
index c98e8b2..8480f36 100644
--- a/fs/kdfs/address_space.c
+++ b/fs/kdfs/address_space.c
@@ -615,11 +615,7 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
 	
 	/* First_Touch has to be called only on the node currently in charge */
 	/* of the page. */
-	// TODO NOW - Adrine
-	// Commented till directory management is not correctly 
-	// striped (dir.c still continues to call kdfs_grap_page
-	// instead of kdfs_distgrab/get....
-	// BUG_ON(kerrighed_node_id != page_linked_node(objid));
+	BUG_ON(kerrighed_node_id != page_linked_node(objid));
 
 	/* Allocate kdfs_page and retrieve page address */
 	k_page = kmalloc(sizeof(struct kdfs_page), GFP_KERNEL);
@@ -658,6 +654,7 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
 
 	kunmap(k_page->page);
 
+	// TODO NOW - Adrien, check why this message occurs each time ? 
 	if (!IS_ERR(k_page->page))
 		DEBUG(DBG_ALERT, "Can't read page for file/directory = %ld and page id = %ld\n", iolinker_data->ino, contentobjid_to_pageindex(objid));
 
diff --git a/fs/kdfs/debug_kdfs.h b/fs/kdfs/debug_kdfs.h
index f9a4785..d5b7777 100644
--- a/fs/kdfs/debug_kdfs.h
+++ b/fs/kdfs/debug_kdfs.h
@@ -29,7 +29,7 @@
 #define DBG_TRACE    3
 #define DBG_INFO     4
 
-#define KDFS_DEBUG_LEVEL 4
+#define KDFS_DEBUG_LEVEL 1
 
 #ifdef DEBUG
 #undef DEBUG
diff --git a/fs/kdfs/dir.c b/fs/kdfs/dir.c
index 6eb9439..5a0f3b4 100644
--- a/fs/kdfs/dir.c
+++ b/fs/kdfs/dir.c
@@ -9,6 +9,7 @@
  * @maintainer Adrien Lebre
  *
  * Copyright (C) 2006-2007, XtreemOS Consortium.
+ * Copyright (C) 2008-20xx, Mines Nantes - INRIA Rennes Bretagne Atlantique - LINA .
  */
 
 #include <linux/buffer_head.h>
@@ -77,7 +78,8 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
 		/* Parse directory dentries */
 		DEBUG (DBG_INFO, "Start to look inside directory\n");
 		do {
-			*k_page = kdfs_grab_page(dir->content_setid, pageid);
+		//	*k_page = kdfs_grab_page(dir->content_setid, pageid);
+			*k_page = kdfs_grab_distpage(dir, pageid);
 			if (IS_ERR(*k_page))
 				DEBUG (DBG_PANIC,
 						"Can't grab page %ld for the directory %ld",
@@ -181,7 +183,8 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
 		DEBUG (DBG_INFO,
 				"Start to look inside directory \n");
 		do {
-			*k_page = kdfs_get_page(dir->content_setid, pageid);
+			//*k_page = kdfs_get_page(dir->content_setid, pageid);
+			*k_page = kdfs_get_distpage(dir,pageid);  
 			if (IS_ERR(*k_page))
 				DEBUG(DBG_PANIC,
 						"Can't get page %ld for the directory %ld\n",
@@ -401,7 +404,8 @@ int kdfs_add_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino,
 	}
 
 	// TODO PRIORITY 1: Test grab reception
-	kdfs_page = kdfs_grab_page(kdfs_pdir->content_setid, pageid);
+//	kdfs_page = kdfs_grab_page(kdfs_pdir->content_setid, pageid);
+	kdfs_page = kdfs_grab_distpage(kdfs_pdir, pageid);
 	ASSERT(kdfs_page != NULL);
 
 	DEBUG(DBG_INFO, "Page Grabbed, gonna add an entry at pageid %ld offset %ld\n", pageid, offset);
@@ -501,7 +505,8 @@ int kdfs_del_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino)
 	offset = (kdfs_pdir->inode->i_size - KDFS_DIRENT_SIZE) % PAGE_SIZE;
 
 	if (last_pageid != k_page->obj_id) {
-		klast_page = kdfs_get_page(kdfs_pdir->content_setid, last_pageid);
+	//	klast_page = kdfs_get_page(kdfs_pdir->content_setid, last_pageid);
+		klast_page = kdfs_get_distpage(kdfs_pdir, last_pageid);
 		last_page_addr = kmap_atomic(klast_page->page, KM_USER1);
 	} else
 		last_page_addr = page_addr;
@@ -678,7 +683,8 @@ int kdfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 		pageoffset = filp->f_pos - (pageid * PAGE_SIZE);
 		npages = (k_inode->inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
 		do {
-			k_page = kdfs_get_page(k_inode->content_setid, pageid);
+		//	k_page = kdfs_get_page(k_inode->content_setid, pageid);
+			k_page = kdfs_get_distpage(k_inode, pageid);
 
 			if (IS_ERR(k_page))
 				DEBUG(DBG_PANIC,

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

Summary of changes:
 fs/kdfs/address_space.c |    7 ++-----
 fs/kdfs/debug_kdfs.h    |    2 +-
 fs/kdfs/dir.c           |   16 +++++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
kdfs