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

[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  9cbe48172fa3966d40a9596dfd4669b421d0adf9 (commit)
      from  927e053074f10d3d9d154f417fb78dde4fdcad94 (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 9cbe48172fa3966d40a9596dfd4669b421d0adf9
Author: ad <leb...@fr...>
Date:   Thu Mar 24 20:52:46 2011 +0000

    [MINOR] - Bypass the FAF service for kDFS files

diff --git a/fs/kdfs/inode.c b/fs/kdfs/inode.c
index 1885d53..39ce20d 100644
--- a/fs/kdfs/inode.c
+++ b/fs/kdfs/inode.c
@@ -1361,7 +1361,6 @@ int kdfs_iol_inode_remove_object(void *object, kddm_set_t *set, objid_t objid)
 				if (!dchild->d_inode)
 					d_drop(dchild);	/* Should we revalidate instead? */
 		}
-		DEBUG(DBG_INFO, "drop dentry\n"); 
 		d_drop(dentry);
 	}
 
diff --git a/fs/kdfs/super.c b/fs/kdfs/super.c
index 8446503..963b924 100644
--- a/fs/kdfs/super.c
+++ b/fs/kdfs/super.c
@@ -1191,7 +1191,7 @@ void kdfs_drop_inode(struct inode *inode)
 // Warning the k_inode should be locked (get/grab)
 void destroy_content_kddmset(struct kdfs_inode *k_inode)
 {
-	DEBUG(DBG_INFO, "Destroy the contentset associated to inode %ld\n", k_inode->inode->i_ino);
+	DEBUG(DBG_INFO, "Destroy the contentset %ld associated to inode %ld\n", k_inode->content_setid, k_inode->inode->i_ino);
 	/* Get the inode and delete its associated content set and its entry in INODE KDDM Set */
 	if (k_inode->content_setid != KDDM_SET_UNUSED) {
 			// WARNING, the set should exist somewhere in the cluster
diff --git a/fs/kdfs/super.h b/fs/kdfs/super.h
index f33d266..510e093 100644
--- a/fs/kdfs/super.h
+++ b/fs/kdfs/super.h
@@ -28,7 +28,8 @@
  *--------------------------------------------------------------------------*/
 
 /* file system regiteration information */
-#define KDFS_SUPER_MAGIC 0x3542
+// Added in include/linux/magic.h (Please note that I don't know/remember how this number has been computed - Adrien April 11th, 2011)
+//#define KDFS_SUPER_MAGIC 0x3542
 
 #define KDFS_SB_FILENAME   ".sb"
 #define KDFS_INODE_FILENAME   ".meta"
diff --git a/include/linux/magic.h b/include/linux/magic.h
index eb9010c..c9f3ed1 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -52,5 +52,6 @@
 #define STACK_END_MAGIC		0x57AC6E9D
 #ifdef CONFIG_KRG_DVFS
 #define OCFS2_SUPER_MAGIC		0x7461636f
+#define KDFS_SUPER_MAGIC 0x3542
 #endif
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/kerrighed/fs/faf/faf.c b/kerrighed/fs/faf/faf.c
index 7a9768a..ec77b35 100644
--- a/kerrighed/fs/faf/faf.c
+++ b/kerrighed/fs/faf/faf.c
@@ -291,6 +291,7 @@ int setup_faf_file_if_needed(struct file *file)
 
 		if (((s_magic == PROC_SUPER_MAGIC) ||
 		     (s_magic == NFS_SUPER_MAGIC)  ||
+		     (s_magic == KDFS_SUPER_MAGIC)  ||
 		     (s_magic == OCFS2_SUPER_MAGIC)) &&
 		    (S_ISREG(i_mode) || S_ISDIR(i_mode) || S_ISLNK(i_mode)))
 			goto exit;

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

Summary of changes:
 fs/kdfs/inode.c        |    1 -
 fs/kdfs/super.c        |    2 +-
 fs/kdfs/super.h        |    3 ++-
 include/linux/magic.h  |    1 +
 kerrighed/fs/faf/faf.c |    1 +
 5 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
kdfs