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

[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  762965ebbe2272674107af959aedba5e62ab1dff (commit)
      from  7ee3a90ed1ce78ad73dd73d9529308ed417c09ed (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 762965ebbe2272674107af959aedba5e62ab1dff
Author: ad <leb...@fr...>
Date:   Tue May 4 10:47:28 2010 +0000

    [JANITORING] remove useless code

diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c
index 8480f36..8034466 100644
--- a/fs/kdfs/address_space.c
+++ b/fs/kdfs/address_space.c
@@ -31,6 +31,9 @@ int kdfs_content_readphyspage(struct content_iolinker_data *content_data,
 		char *page_addr, loff_t pos);
 int kdfs_content_writephyspage(struct content_iolinker_data *content_data,
 		char *page_addr, loff_t from, loff_t to);
+/*
+ * Versionning management (cf. Pierre Riteau's Master thesis)
+ */
 int kdfs_content_readphyspage_cow(struct content_iolinker_data *content_data,
 		char *page_addr, loff_t pos);
 int kdfs_content_writephyspage_cow(struct content_iolinker_data *content_data,
@@ -60,7 +63,6 @@ int kdfs_content_writephyspage(struct content_iolinker_data *content_data,
 	return 0;
 }
 
-
 /*****************************************************************************/
 /*                                                                           */
 /*                         ADDRESS SPACE OPERATIONS                          */
@@ -84,8 +86,6 @@ int kdfs_readpage(struct file *file, struct page *page)
 		DEBUG (DBG_PANIC, "No contentset associated.... looks really strange (inode %lu, name %s)\n",
 				k_inode->inode->i_ino, 	list_entry(k_inode->inode->i_dentry.next, struct dentry, d_alias)->d_name.name);
 
-	/* TODO PRIORITY 2: test kdfs_get_page returned value */
-//	k_page = kdfs_get_page(k_inode->content_setid,page->index);  
 	k_page = kdfs_get_distpage(k_inode,page->index);  
 
 	DEBUG(DBG_INFO, " Readpage k_page->page : %p  and page %p\n", k_page->page, page);
@@ -127,7 +127,6 @@ int __kdfs_prepare_write (struct file *file, struct page *page,
 		DEBUG (DBG_PANIC, "No contentset associated.... looks really strange \n");
 	}
 
-	/* TODO PRIORITY 2: test kdfs_grab_page returned value */
 	k_page = kdfs_grab_distpage(k_inode, page->index);
 	BUG_ON(k_page->page != page) ;
 	k_page->offset = offset;
@@ -166,10 +165,6 @@ int kdfs_write_begin (struct file *file,
  * Priority : 3
  * Merge new kdfs_write_begin function with the older kdfs_prepare_write.
  */
-/* TODO Suggested by Adrien for Adrien, 
- * an old TODO, ... probably just remove it ;) 
- * cf. http://www.mail-archive.com/git...@vg.../msg03083.html
- */ 
 int __kdfs_commit_write(struct file *file,
 		struct page *page,
 		unsigned offset,
@@ -196,8 +191,6 @@ int __kdfs_commit_write(struct file *file,
 	 * However, due to the write behind issue at such a distributed level, we have
 	 * chosen to directly call the kDDM sync functions (write through)
 	 */
-//	kdfs_mark_page_dirty(k_inode->content_setid, page->index);
-//      __kdfs_distput_page(k_inode->content_setid, page->index);
 	kdfs_distmark_page_dirty(k_inode, page->index);
 	_kdfs_put_page((struct kdfs_page*)page->private);
 
@@ -308,8 +301,6 @@ struct address_space_operations kdfs_aops = {
 /*                                                                           */
 /*****************************************************************************/
 
-// TODO NOW - Adrien, PROC functions, kdfs_ilocalfind is already called before kdfs_get/grab page. 
-// I did that just to be faster, will improve that later if the code runs ;) 
 struct kdfs_page *kdfs_get_distpage(struct kdfs_inode *k_inode, pgoff_t  page_id){
 	struct kdfs_page *k_page; 
 	kdfs_node_t masternode ; 
@@ -332,7 +323,6 @@ struct kdfs_page *kdfs_get_distpage(struct kdfs_inode *k_inode, pgoff_t  page_id
 			return k_page; 
 }
 
-
 struct kdfs_page *kdfs_get_page(kddm_set_id_t set_id, objid_t obj_id)
 {
 	DEBUG(DBG_INFO, "Get object  %ld from set %ld\n", obj_id, set_id);
@@ -653,11 +643,6 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
 	DEBUG(DBG_TRACE, "After find Page count=%d\n", page_count(k_page->page));
 
 	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));
-
 	objEntry->object = (void *) k_page;
 
 	// Note: the page has not been release, this action should be perform
diff --git a/fs/kdfs/debug_kdfs.h b/fs/kdfs/debug_kdfs.h
index d5b7777..9b5ddbc 100644
--- a/fs/kdfs/debug_kdfs.h
+++ b/fs/kdfs/debug_kdfs.h
@@ -40,7 +40,7 @@
 #else
 #  define DEBUG(level, format, args...) \
 do { \
-	if (KDFS_DEBUG_LEVEL >= level || level == DBG_PANIC) {				\
+	if (KDFS_DEBUG_LEVEL >= level) {				\
       /*pr_debug*/printk("KDFS - %s @ (%s : %d) - %d | ", __func__, __FILE__, __LINE__, \
               current->pid) ; \
       /*pr_debug*/printk(format, ## args) ; \

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

Summary of changes:
 fs/kdfs/address_space.c |   21 +++------------------
 fs/kdfs/debug_kdfs.h    |    2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
kdfs