From: Marko O. <d0...@us...> - 2010-03-24 22:25:24
|
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 1b9e05ab401cc4a857b15868a3097dfe21f43c46 (commit) via 3df2d6d10c565727d1199df459b50de472e7482f (commit) from 42ef403e52c81ccc23988091c27919207a2e8eae (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 1b9e05ab401cc4a857b15868a3097dfe21f43c46 Author: Marko Obrovac <mar...@in...> Date: Wed Mar 24 23:23:21 2010 +0000 Mark kDFS as experimental in Kconfig diff --git a/fs/kdfs/Kconfig b/fs/kdfs/Kconfig index 9bbf605..a65d83c 100644 --- a/fs/kdfs/Kconfig +++ b/fs/kdfs/Kconfig @@ -1,9 +1,9 @@ config KDFS_FS - tristate "kDFS" - depends on KERRIGHED + tristate "kDFS (EXPERIMENTAL)" + depends on KERRIGHED && EXPERIMENTAL default n help Kerrighed/Kernel distributed FS. This is the Distributed Kerrighed file system which tends to exploit node hard drives. - If unsure, say Y. + If unsure, say N. commit 3df2d6d10c565727d1199df459b50de472e7482f Author: Marko Obrovac <mar...@in...> Date: Thu Mar 25 00:14:14 2010 +0100 Separate the retrieval of local and remote mappings diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c index cf15936..8ef8f46 100644 --- a/fs/kdfs/address_space.c +++ b/fs/kdfs/address_space.c @@ -894,10 +894,17 @@ int content_instantiate(kddm_set_t *kddm_set, void *private_data, int master) DEBUG(DBG_INFO, "K_mapping from the cache\n"); content_data->k_mapping = inode->i_mapping; iput(inode); - } else { - DEBUG(DBG_INFO, "K_mapping will be retrieve from iget\n"); + } else if (inode_linked_node(content_data->ino) == kerrighed_node_id){ + DEBUG(DBG_INFO, "K_mapping will be retrieve from iget - the inode is on this node\n"); inode = kdfs_getinode(k_sb->sb, content_data->ino); content_data->k_mapping = inode->i_mapping; + } else { + DEBUG(DBG_INFO, "K_mapping created from dummy inode info\n"); + inode = new_inode(k_sb->sb); + inode->i_ino = content_data->ino; + insert_inode_hash(inode); + //inode = kdfs_getinode(k_sb->sb, content_data->ino); + content_data->k_mapping = inode->i_mapping; } if (!content_data->k_mapping) DEBUG(DBG_PANIC, "k_mapping was not cleanly initialized\n"); ----------------------------------------------------------------------- Summary of changes: fs/kdfs/Kconfig | 6 +++--- fs/kdfs/address_space.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) hooks/post-receive -- kdfs |