Menu
▾
▴
[Kdfs-commits] [kernel]kdfs branch, make_kdfs_compile, updated. e022fc85cfe0f7df2194c7591e7fbd5e2ff624e2
|
From: Marko O. <d0...@us...> - 2010-12-21 20:28: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 e022fc85cfe0f7df2194c7591e7fbd5e2ff624e2 (commit)
from e14c559171de11d5ac30d0bc2e92592d88e06ee6 (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 e022fc85cfe0f7df2194c7591e7fbd5e2ff624e2
Author: Marko Obrovac <mar...@in...>
Date: Tue Dec 21 22:27:09 2010 +0100
[CLEAN] replace %ld with %lu where appropriate (in DEBUG outputs)
diff --git a/fs/kdfs/address_space.c b/fs/kdfs/address_space.c
index 0b10c46..33bd7f9 100644
--- a/fs/kdfs/address_space.c
+++ b/fs/kdfs/address_space.c
@@ -128,7 +128,7 @@ int __kdfs_prepare_write (struct file *file, struct page *page,
struct kdfs_page *k_page = NULL;
struct kdfs_inode *k_inode = NULL;
- DEBUG (DBG_INFO, "prepare_write for file %s (ino %ld), page %ld from %d to %d (count = %d, mapping = %p)\n",
+ DEBUG (DBG_INFO, "prepare_write for file %s (ino %lu), page %lu from %d to %d (count = %d, mapping = %p)\n",
file->f_dentry->d_name.name, file->f_dentry->d_inode->i_ino, page->index, offset, _to, page_count(page), page->mapping);
BUG_ON (page->mapping == NULL);
@@ -185,7 +185,7 @@ int __kdfs_commit_write(struct file *file,
{
struct kdfs_inode *k_inode = NULL;
- DEBUG(DBG_INFO, "commit_write for page %ld for file %s"
+ DEBUG(DBG_INFO, "commit_write for page %lu for file %s"
"(ino %lu) (from %u to %u) (count = %d)\n",
page->index, file->f_dentry->d_name.name,
file->f_dentry->d_inode->i_ino, offset, _to,
@@ -269,7 +269,7 @@ void kdfs_invalidatepage(struct page *page, unsigned long offset)
/* The whole page is invalidated so it should be removed */
/* TODO Should we really remove the page from the physical storage */
/* Currently only the inode is updated, it seems to be sufficient */
- DEBUG(DBG_INFO, "Gonna invalidate page %ld (objid %ld from set %ld)\n", page->index, k_page->obj_id,k_page->set_id);
+ DEBUG(DBG_INFO, "Gonna invalidate page %lu (objid %lu from set %lu)\n", page->index, k_page->obj_id,k_page->set_id);
if(kddm_flush_object(kddm_def_ns, k_page->set_id, k_page->obj_id, KERRIGHED_NODE_ID_NONE) == -ENOSPC)
/* There is only one copy, so we should exploit remove instead of flush */
kddm_remove_object(kddm_def_ns, k_page->set_id, k_page->obj_id);
@@ -293,7 +293,7 @@ int kdfs_releasepage(struct page *page, gfp_t mask)
ASSERT (page->mapping != NULL);
k_page = (struct kdfs_page *) page->private;
- DEBUG(DBG_INFO, "Gonna release page %ld (objid %ld from set %ld)\n", page->index, k_page->obj_id,k_page->set_id);
+ DEBUG(DBG_INFO, "Gonna release page %lu (objid %lu from set %lu)\n", page->index, k_page->obj_id,k_page->set_id);
if(kddm_flush_object(kddm_def_ns, k_page->set_id, k_page->obj_id, KERRIGHED_NODE_ID_NONE) == -ENOSPC)
/* There is only one copy, so we should exploit remove instead of flush */
kddm_remove_object(kddm_def_ns, k_page->set_id, k_page->obj_id);
@@ -336,7 +336,7 @@ struct kdfs_page *kdfs_get_distpage(struct kdfs_inode *k_inode, pgoff_t page_id
objid = pageindex_to_contentobjid(masternode, page_id);
- DEBUG(DBG_INFO, "Get page %ld (masternode %d, objid %ld from set %ld)\n", page_id, masternode, objid, k_inode->content_setid);
+ DEBUG(DBG_INFO, "Get page %lu (masternode %d, objid %lu from set %lu)\n", page_id, masternode, objid, k_inode->content_setid);
BUG_ON(objid == -1);
k_page =kdfs_get_page(k_inode->content_setid,objid);
@@ -345,7 +345,7 @@ struct kdfs_page *kdfs_get_distpage(struct kdfs_inode *k_inode, pgoff_t page_id
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);
+ DEBUG(DBG_INFO, "Get object %lu from set %lu\n", obj_id, set_id);
return kddm_get_object(kddm_def_ns, set_id, obj_id);
}
@@ -366,7 +366,7 @@ struct kdfs_page *kdfs_grab_distpage(struct kdfs_inode *k_inode, pgoff_t page_id
} else if (masternode != kerrighed_node_id) {
// the page already exists but teh grab is done remotely to the masternode, so : grab the previous object and reassign this page to the current node
objid = pageindex_to_contentobjid(masternode, page_id);
- DEBUG(DBG_INFO, "Gonna grab prevpage %ld from set %ld (objid = %ld)\n", page_id, k_inode->content_setid, objid);
+ DEBUG(DBG_INFO, "Gonna grab prevpage %lu from set %lu (objid = %lu)\n", page_id, k_inode->content_setid, objid);
k_prevpage=kdfs_grab_page(k_inode->content_setid, objid);
/* set the page's owner to this node */
@@ -376,7 +376,7 @@ struct kdfs_page *kdfs_grab_distpage(struct kdfs_inode *k_inode, pgoff_t page_id
}
objid = pageindex_to_contentobjid(masternode, page_id);
- DEBUG(DBG_INFO, "Gonna grab page %ld from set %ld (objid = %ld)\n", page_id, k_inode->content_setid, objid);
+ DEBUG(DBG_INFO, "Gonna grab page %lu from set %lu (objid = %lu)\n", page_id, k_inode->content_setid, objid);
k_newpage=kdfs_grab_page(k_inode->content_setid, objid);
if(k_prevpage){
@@ -393,14 +393,14 @@ struct kdfs_page *kdfs_grab_distpage(struct kdfs_inode *k_inode, pgoff_t page_id
struct kdfs_page *kdfs_grab_page(kddm_set_id_t set_id, objid_t obj_id)
{
- DEBUG(DBG_INFO, "Grab object %ld from set %ld\n", obj_id, set_id);
+ DEBUG(DBG_INFO, "Grab object %lu from set %lu\n", obj_id, set_id);
return kddm_grab_object(kddm_def_ns, set_id, obj_id);
}
struct kdfs_page *kdfs_findlocal_page(kddm_set_id_t set_id, objid_t obj_id)
{
- DEBUG(DBG_INFO, "Grab object %ld from set %ld\n", obj_id, set_id);
+ DEBUG(DBG_INFO, "Grab object %lu from set %lu\n", obj_id, set_id);
return kddm_find_object(kddm_def_ns, set_id, obj_id);
}
@@ -411,12 +411,12 @@ void __kdfs_put_page(kddm_set_id_t set_id, objid_t obj_id)
void _kdfs_put_page(struct kdfs_page *k_page)
{
- DEBUG(DBG_INFO, "Put object %ld from set %ld\n", k_page->obj_id, k_page->set_id);
+ DEBUG(DBG_INFO, "Put object %lu from set %lu\n", k_page->obj_id, k_page->set_id);
kddm_put_object(kddm_def_ns, k_page->set_id, k_page->obj_id);
}
void kdfs_distmark_page_dirty(struct kdfs_inode *k_inode, pgoff_t page_id){
- DEBUG(DBG_INFO, "Gonna sync page %ld from set %ld\n", page_id, k_inode->content_setid);
+ DEBUG(DBG_INFO, "Gonna sync page %lu from set %lu\n", page_id, k_inode->content_setid);
kdfs_mark_page_dirty(k_inode->content_setid,
pageindex_to_contentobjid(
kdfs_file_extent_get_page_owner(k_inode, page_id),page_id));
@@ -424,7 +424,7 @@ void kdfs_distmark_page_dirty(struct kdfs_inode *k_inode, pgoff_t page_id){
void kdfs_mark_page_dirty(kddm_set_id_t set_id, objid_t obj_id)
{
- DEBUG(DBG_INFO, "Sync object %ld from set %lu\n", obj_id, set_id);
+ DEBUG(DBG_INFO, "Sync object %lu from set %lu\n", obj_id, set_id);
kddm_sync_frozen_object(kddm_def_ns, set_id, obj_id);
}
@@ -466,7 +466,7 @@ kddm_set_t *__create_content_kddm_set(kddm_set_id_t set_id,
content_data, sizeof(struct content_iolinker_data), KDDM_FT_LINKED);
if (IS_ERR(kddm_set))
- DEBUG(DBG_PANIC, "Can't create content kddm_set for inode %ld\n", k_inode->inode->i_ino);
+ DEBUG(DBG_PANIC, "Can't create content kddm_set for inode %lu\n", k_inode->inode->i_ino);
/* We can free all the memory allocated */
kfree(content_data);
@@ -532,19 +532,19 @@ int kdfs_iol_page_alloc(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid)
pageid = contentobjid_to_pageindex(objid);
- DEBUG(DBG_INFO, "Before Alloc objid %ld from set %lu (page id %ld)\n", objid, set->id, pageid);
+ DEBUG(DBG_INFO, "Before Alloc objid %lu from set %lu (page id %lu)\n", objid, set->id, pageid);
/* The page can be already in the cache, especially when we dynamically change the default owner */
k_page->page = find_get_page(k_mapping, pageid);
if (!k_page->page) {
DEBUG(DBG_ALERT,
- "Can't find page for file/directory = %ld and page id = %ld @mapping = %p, So created and locked\n",
+ "Can't find page for file/directory = %lu and page id = %lu @mapping = %p, So created and locked\n",
k_mapping->host->i_ino, objid,k_mapping);
k_page->page = find_or_create_page(k_mapping, pageid, mapping_gfp_mask(k_mapping) & ~__GFP_FS);
k_page->flags = K_PG_locked;
} else
k_page->flags = K_PG_ok;
- DEBUG(DBG_INFO, "After Alloc new page %ld from set %lu (page addr=%p count=%d)\n", objid, set->id, k_page->page, page_count(k_page->page));
+ DEBUG(DBG_INFO, "After Alloc new page %lu from set %lu (page addr=%p count=%d)\n", objid, set->id, k_page->page, page_count(k_page->page));
k_page->set_id = set->id;
k_page->obj_id = objid;
@@ -590,7 +590,7 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
/* What do you mean : locking the physical file, what kddm object ? the inode one ? */
k_mapping = ((struct content_iolinker_data *) set->private_data)->k_mapping;
BUG_ON(k_mapping == NULL);
- DEBUG(DBG_TRACE, "file/directory = %ld, pageid = %ld, objid = %ld, @mapping = %p\n", iolinker_data->ino,pageid, objid, k_mapping);
+ DEBUG(DBG_TRACE, "file/directory = %lu, pageid = %lu, objid = %lu, @mapping = %p\n", iolinker_data->ino,pageid, objid, k_mapping);
/* First_Touch has to be called only on the node currently in charge */
/* of the page. */
@@ -619,8 +619,8 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
page_addr = (char *) kmap(k_page->page);
pos = (loff_t)pageid * PAGE_SIZE;
- DEBUG(DBG_TRACE, "The page for file/directory = %ld and " \
- "page id = %ld is not in the cache. So created/locked and read from HDD (kmap page address %p, page address %p)\n", iolinker_data->ino,
+ DEBUG(DBG_TRACE, "The page for file/directory = %lu and " \
+ "page id = %lu is not in the cache. So created/locked and read from HDD (kmap page address %p, page address %p)\n", iolinker_data->ino,
pageid,page_addr, k_page->page);
/* The page should be filled only if it was not handled
@@ -636,7 +636,7 @@ int kdfs_iol_page_first_touch(kddm_obj_t *objEntry,
kunmap(k_page->page);
objEntry->object = (void *) k_page;
- DEBUG(DBG_INFO, "After first touch, page %ld from set %lu (page addr=%p count=%d)\n", objid, set->id, k_page->page, page_count(k_page->page));
+ DEBUG(DBG_INFO, "After first touch, page %lu from set %lu (page addr=%p count=%d)\n", objid, set->id, k_page->page, page_count(k_page->page));
// Note: the page has not been release, this action should be perform
// in the insert or export function according the kddm operation (get or grab)
PRINT_FUNCTION_EXIT;
@@ -706,7 +706,7 @@ int kdfs_iol_page_export (struct rpc_desc *desc,
PRINT_FUNCTION_NAME;
- DEBUG(DBG_INFO, "Gonna export objid %ld from set %ld with state\n", objid,k_page->set_id);
+ DEBUG(DBG_INFO, "Gonna export objid %lu from set %lu with state\n", objid,k_page->set_id);
res = rpc_pack(desc, 0, &k_page->flags, sizeof(k_page->flags));
if (res < 0)
DEBUG(DBG_ALERT, "can't pack export page state (res=%d)\n", res);
@@ -775,7 +775,7 @@ int kdfs_iol_page_invalidate(kddm_obj_t *objEntry, kddm_set_t *set,
*/
BUG_ON(contentobjid_to_pageindex(objid)!=k_page->page->index);
- DEBUG(DBG_INFO, "Try to invalidate objid %ld (page id %ld page addr %p) of set %lu\n", objid, k_page->page->index, k_page->page, set->id);
+ DEBUG(DBG_INFO, "Try to invalidate objid %lu (page id %lu page addr %p) of set %lu\n", objid, k_page->page->index, k_page->page, set->id);
trylock_page(k_page->page);
remove_from_page_cache(k_page->page);
@@ -818,7 +818,7 @@ int kdfs_iol_page_import(struct rpc_desc *desc,
res = rpc_unpack(desc, 0,&k_page->flags, sizeof(k_page->flags));
- DEBUG(DBG_INFO, "Gonna import objid %ld from set %ld with state\n", objid,k_page->set_id);
+ DEBUG(DBG_INFO, "Gonna import objid %lu from set %lu with state\n", objid,k_page->set_id);
if(!res && k_page->flags!=K_PG_invalid){
// We should not import a page which is not consistent with
// the implicit striping mechanim.
@@ -855,7 +855,7 @@ int kdfs_iol_page_sync(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid)
ASSERT(k_page != NULL);
ASSERT(k_page->page != NULL);
- DEBUG(DBG_INFO, "Try to sync page %ld (page addr %p) of set %lu\n", objid, k_page->page, set->id);
+ DEBUG(DBG_INFO, "Try to sync page %lu (page addr %p) of set %lu\n", objid, k_page->page, set->id);
file_pos = ((loff_t)contentobjid_to_pageindex(objid) * PAGE_SIZE) + k_page->offset;
page_addr = (char *) kmap(k_page->page);
@@ -906,7 +906,7 @@ int kdfs_iol_page_remove(void *object, struct kddm_set *set, objid_t objid)
struct kdfs_page *k_page = (struct kdfs_page *) object;
PRINT_FUNCTION_NAME;
- DEBUG(DBG_INFO, "Gonna remove objid %ld from set %ld\n", k_page->obj_id,k_page->set_id);
+ DEBUG(DBG_INFO, "Gonna remove objid %lu from set %lu\n", k_page->obj_id,k_page->set_id);
if ((!PageLocked(k_page->page))) {
/*
* This is not the kernel trying to remove the page but the KDDMs,
@@ -959,7 +959,7 @@ int kdfs_iol_content_instantiate(kddm_set_t *kddm_set, void *private_data, int m
ASSERT(kddm_set->private_data != NULL);
content_data = (struct content_iolinker_data *) kddm_set->private_data;
- DEBUG(DBG_INFO, "Instantiate kddm %ld with ino : %ld\n", kddm_set->id, content_data->ino);
+ DEBUG(DBG_INFO, "Instantiate kddm %lu with ino : %lu\n", kddm_set->id, content_data->ino);
if (kddm_set->def_owner == kerrighed_node_id || kddm_set->def_owner == KDDM_CUSTOM_DEF_OWNER) {
content_data->phys_dirname = kmalloc(PATH_MAX, GFP_KERNEL);
@@ -1039,10 +1039,10 @@ void kdfs_iol_content_uninstantiate(kddm_set_t *kddm_set, int destroy)
ASSERT(kddm_set->private_data != NULL);
content_data = (struct content_iolinker_data *) kddm_set->private_data;
- DEBUG (DBG_INFO, "uninstantiate content kddm_set link to inode %ld (pid: %d, %s, %d)\n", content_data->ino, current->pid, current->comm, task_pid_knr(current) );
+ DEBUG (DBG_INFO, "uninstantiate content kddm_set link to inode %lu (pid: %d, %s, %d)\n", content_data->ino, current->pid, current->comm, task_pid_knr(current) );
if (content_data->phys_dirname != NULL) {
- DEBUG (DBG_TRACE, "uninstantiate content kddm_set link to inode %ld (physical file:%s)",
+ DEBUG (DBG_TRACE, "uninstantiate content kddm_set link to inode %lu (physical file:%s)",
content_data->ino,content_data->phys_dirname);
kfree(content_data->phys_dirname);
}
diff --git a/fs/kdfs/dir.c b/fs/kdfs/dir.c
index daef9c7..022d60d 100644
--- a/fs/kdfs/dir.c
+++ b/fs/kdfs/dir.c
@@ -61,7 +61,7 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
void *page_addr = NULL ;
DEBUG (DBG_INFO,
- "Look up for entry %s in directory %ld\n",
+ "Look up for entry %s in directory %lu\n",
filename, dir->inode->i_ino);
npages = (dir->inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
@@ -82,7 +82,7 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
*k_page = kdfs_grab_distpage(dir, pageid);
if (IS_ERR(*k_page))
DEBUG (DBG_PANIC,
- "Can't grab page %ld for the directory %ld",
+ "Can't grab page %lu for the directory %lu",
pageid, dir->content_setid);
tmp_page = (*k_page)->page;
@@ -92,15 +92,15 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
/* For each entry contained in the page */
do {
DEBUG (DBG_INFO,
- "Grab page %ld:"
- "page addr (mapped %p, unmapped %p), dentry_addr %p (file size %lld)\n",
+ "Grab page %lu:"
+ "page addr (mapped %p, unmapped %p), dentry_addr %p (file size %llu)\n",
pageid, page_addr, tmp_page, dentry_addr,
dir->inode->i_size);
/* Get the directory entry */
dir_entry = (struct kdfs_dir_entry *) dentry_addr;
/* Did we find the right entry */
- DEBUG (DBG_INFO, "filelen %d dirfilelen %d, filename %s dirname %s, dirlen %d (dirino %ld)\n",
+ DEBUG (DBG_INFO, "filelen %d dirfilelen %d, filename %s dirname %s, dirlen %d (dirino %lu)\n",
filename_len, dir_entry->name_len, filename, dir_entry->name,dir_entry->rec_len, dir_entry->ino);
if (dir_entry->name_len == filename_len &&
strncmp (dir_entry->name, filename, filename_len) == 0)
@@ -124,7 +124,7 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
} // end if there are some entries
- DEBUG (DBG_INFO, "Look up for file %s in directory %ld : notfound \n",
+ DEBUG (DBG_INFO, "Look up for file %s in directory %lu : notfound \n",
filename, dir->inode->i_ino);
// TODO PRIORITY 1: put_kddm_set required a reference on the set.
// I have to add a reference inside kdfs_page structure :(
@@ -133,7 +133,7 @@ struct kdfs_dir_entry *kdfs_grab_entry (struct kdfs_inode *dir, const char *file
found:
DEBUG (DBG_INFO,
- "Look up for file %s in directory %ld: found : %p\n",
+ "Look up for file %s in directory %lu: found : %p\n",
filename, dir->inode->i_ino, dir_entry);
return dir_entry;
}
@@ -165,7 +165,7 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
void *page_addr = NULL;
DEBUG(DBG_INFO,
- "Look up for entry %s in directory %ld\n",
+ "Look up for entry %s in directory %lu\n",
filename, dir->inode->i_ino);
npages = (dir->inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
@@ -187,7 +187,7 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
*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",
+ "Can't get page %lu for the directory %lu\n",
pageid, dir->content_setid);
tmp_page = (*k_page)->page;
@@ -197,14 +197,14 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
/* For each entry contained in the page */
do {
DEBUG(DBG_INFO,
- "page addr %p, dentry_addr %p (file size %lld)\n",
+ "page addr %p, dentry_addr %p (file size %llu)\n",
page_addr, dentry_addr, dir->inode->i_size);
/* Get the directory entry */
dir_entry = (struct kdfs_dir_entry *) dentry_addr;
/* Did we find the right entry */
DEBUG(DBG_INFO,
- "file:%s (filename_len %d), dir:%s (dirfilename_len %d), dirlen %d (dirino %ld)\n",
+ "file:%s (filename_len %d), dir:%s (dirfilename_len %d), dirlen %d (dirino %lu)\n",
filename, filename_len, dir_entry->name, dir_entry->name_len, dir_entry->rec_len, dir_entry->ino);
if (dir_entry->name_len == filename_len &&
strncmp (dir_entry->name, filename, filename_len) == 0)
@@ -229,7 +229,7 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
} // end if there are some entries
DEBUG(DBG_INFO,
- "Look up for file %s in directory %ld : notfound\n",
+ "Look up for file %s in directory %lu : notfound\n",
filename, dir->inode->i_ino);
// TODO PRIORITY 1: put_kddm_set required a reference on the set.
// I have to add a reference inside kdfs_page structure :(
@@ -238,7 +238,7 @@ struct kdfs_dir_entry *kdfs_find_entry(struct kdfs_inode *dir,
found:
DEBUG(DBG_INFO,
- "Look up for file %s in directory %ld: found : %p\n",
+ "Look up for file %s in directory %lu: found : %p\n",
filename, dir->inode->i_ino, dir_entry);
return dir_entry;
}
@@ -272,7 +272,7 @@ ino_t kdfs_inode_by_name(struct kdfs_inode *dir, struct dentry *dentry)
dir_entry = kdfs_find_entry(dir, dentry->d_name.name, &k_page);
if (dir_entry) {
res = le32_to_cpu(dir_entry->ino);
- DEBUG(DBG_INFO, "ino : %ld \n", res);
+ DEBUG(DBG_INFO, "ino : %lu \n", res);
_kdfs_put_page(k_page);
// TODO PRIORITY 1: put_kddm_set required a reference on the set.
// I have to add a reference inside kdfs_page structure :(
@@ -378,7 +378,7 @@ int kdfs_add_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino,
ASSERT(kdfs_pdir != NULL);
DEBUG(DBG_INFO,
- "Adding file %s to directory (inode %ld) with mode %o\n", filename,
+ "Adding file %s to directory (inode %lu) with mode %o\n", filename,
kdfs_pdir->inode->i_ino, mode);
/* TODO PRIORITY 2: should be useless since kdfs_pdir is logically already grabbed but requires a confirmation */
@@ -408,7 +408,7 @@ int kdfs_add_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino,
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);
+ DEBUG(DBG_INFO, "Page Grabbed, gonna add an entry at pageid %lu offset %lu\n", pageid, offset);
/* Fill the new directory entry */
page_addr = kmap (kdfs_page->page);
@@ -423,7 +423,7 @@ int kdfs_add_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino,
dir_entry->rec_len = __cpu_to_le16(KDFS_DIRENT_SIZE);
DEBUG(DBG_INFO,
- "Size of direntry %d size of filename %d inode %ld\n",
+ "Size of direntry %d size of filename %d inode %lu\n",
dir_entry->rec_len, dir_entry->name_len, dir_entry->ino);
dir_entry->mode = mode;
@@ -451,7 +451,7 @@ int kdfs_add_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino,
// kdfs_iput(kdfs_pdir->inode->i_ino);
DEBUG(DBG_INFO,
- "Adding file %s (with ino %ld) to directory (inode %ld): done\n",
+ "Adding file %s (with ino %lu) to directory (inode %lu): done\n",
filename, dir_entry->ino, kdfs_pdir->inode->i_ino);
return 0;
@@ -490,7 +490,7 @@ int kdfs_del_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino)
/* We found the direntry, let's remove it! */
res = le32_to_cpu(dir_entry->ino);
- DEBUG(DBG_INFO, "found direntry : ino = %ld \n", res);
+ DEBUG(DBG_INFO, "found direntry : ino = %lu \n", res);
page_addr = page_address(k_page->page);
/* TODO PRIORITY 1: Should we grab parent dir inode */
@@ -546,7 +546,7 @@ int kdfs_del_dir_entry(struct kdfs_inode *kdfs_pdir, char *filename, ino_t ino)
}
}
- DEBUG(DBG_INFO, "new file size : %lld\n", kdfs_pdir->inode->i_size);
+ DEBUG(DBG_INFO, "new file size : %llu\n", kdfs_pdir->inode->i_size);
/* Update timestamps */
kdfs_pdir->inode->i_mtime = kdfs_pdir->inode->i_ctime = CURRENT_TIME_SEC;
@@ -600,7 +600,7 @@ int kdfs_make_empty(struct kdfs_inode *k_pdir, struct kdfs_inode *k_dir)
*/
int kdfs_dir_empty(struct kdfs_inode *k_dir)
{
- DEBUG(DBG_INFO, "Directory size: %llu empty if: %ld\n", k_dir->inode->i_size, KDFS_DIRENT_SIZE * 2);
+ DEBUG(DBG_INFO, "Directory size: %llu empty if: %lu\n", k_dir->inode->i_size, KDFS_DIRENT_SIZE * 2);
if (k_dir->inode->i_size > KDFS_DIRENT_SIZE * 2)
return 0;
return 1;
@@ -648,7 +648,7 @@ int kdfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
int res = 0;
DEBUG(DBG_INFO,
- "readdir %s: file offset = %d, file size = %lld, (inode %ld)\n",
+ "readdir %s: file offset = %d, file size = %llu, (inode %lu)\n",
filp->f_dentry->d_name.name, (int) filp->f_pos, filp->f_dentry->d_inode->i_size, filp->f_dentry->d_inode->i_ino);
/* Retrieve the dir kddm_set associated with the directory */
@@ -688,7 +688,7 @@ int kdfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
if (IS_ERR(k_page))
DEBUG(DBG_PANIC,
- "Can't get page %ld for the directory %ld\n",
+ "Can't get page %lu for the directory %lu\n",
pageid, k_inode->content_setid);
tmp_page = k_page->page;
@@ -700,7 +700,7 @@ int kdfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
/* Get the directory entry */
dir_entry = (struct kdfs_dir_entry *) dentry_addr;
DEBUG(DBG_INFO,
- "dentry_addr %p (dir_len %d, dirname %s, namelen %d, file size %lld, file pos %lld PAGESIZE=%ld pageoffset=%u)\n",
+ "dentry_addr %p (dir_len %d, dirname %s, namelen %d, file size %llu, file pos %llu PAGESIZE=%lu pageoffset=%u)\n",
dentry_addr,dir_entry->rec_len, dir_entry->name, dir_entry->name_len, k_inode->inode->i_size, filp->f_pos, PAGE_SIZE, pageoffset);
/* Fill the buffer with the current directory entry */
@@ -737,7 +737,7 @@ int kdfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
}
else
DEBUG(DBG_INFO,
- "kDFS : readdir %s: file is zero length (file size = %lld, inode %ld)\n",
+ "kDFS : readdir %s: file is zero length (file size = %llu, inode %lu)\n",
filp->f_dentry->d_name.name, filp->f_dentry->d_inode->i_size, filp->f_dentry->d_inode->i_ino);
out:
@@ -784,11 +784,11 @@ kddm_set_t *create_dir_kddm_set(struct kdfs_inode *dir)
if (!IS_ERR(kddm_set)) {
dir->content_setid = kddm_set->id;
DEBUG(DBG_TRACE,
- "Create content kddm_set for directory %ld with id %ld\n",
+ "Create content kddm_set for directory %lu with id %lu\n",
dir->inode->i_ino, dir->content_setid);
} else
DEBUG(DBG_PANIC,
- "Can't create content kddm_set for directory %ld\n",
+ "Can't create content kddm_set for directory %lu\n",
dir->inode->i_ino);
return kddm_set;
diff --git a/fs/kdfs/file.c b/fs/kdfs/file.c
index 74fd1a1..f04018a 100644
--- a/fs/kdfs/file.c
+++ b/fs/kdfs/file.c
@@ -42,13 +42,13 @@ loff_t kdfs_llseek(struct file *filp, loff_t offset, int origin)
loff_t r;
DEBUG(DBG_INFO,
- "lseek on file %s at offset %lld current offset is %lld\n",
+ "lseek on file %s at offset %llu current offset is %llu\n",
filp->f_dentry->d_name.name, offset, filp->f_pos);
r = generic_file_llseek(filp, offset, origin);
DEBUG(DBG_INFO,
- "lseek on file %s offset is now %lld: done with err %lld\n",
+ "lseek on file %s offset is now %llu: done with err %llu\n",
filp->f_dentry->d_name.name,
filp->f_pos, r);
@@ -61,7 +61,7 @@ ssize_t kdfs_read(struct file *filp, char *buf, size_t count, loff_t *ppos)
struct kdfs_inode *kdfs_inode = NULL;
DEBUG(DBG_INFO,
- "Start to read %zd bytes from file %s at offset %lld in buffer %p\n",
+ "Start to read %zd bytes from file %s at offset %llu in buffer %p\n",
count, filp->f_dentry->d_name.name, *ppos, buf);
kdfs_inode = kdfs_iget(filp->f_dentry->d_inode->i_ino);
@@ -76,7 +76,7 @@ ssize_t kdfs_read(struct file *filp, char *buf, size_t count, loff_t *ppos)
kdfs_iput(filp->f_dentry->d_inode->i_ino);
- DEBUG(DBG_INFO, "read of file %s at offset %lld: done\n",
+ DEBUG(DBG_INFO, "read of file %s at offset %llu: done\n",
filp->f_dentry->d_name.name, *ppos);
return r;
@@ -88,7 +88,7 @@ ssize_t kdfs_write(struct file *filp, const char *buf, size_t count, loff_t *ppo
struct kdfs_inode *kdfs_inode = NULL;
DEBUG(DBG_INFO,
- "write %zd bytes to file %s at offset %lld\n",
+ "write %zd bytes to file %s at offset %llu\n",
count, filp->f_dentry->d_name.name, *ppos);
kdfs_inode = kdfs_igrab(filp->f_dentry->d_inode->i_ino);
@@ -103,7 +103,7 @@ ssize_t kdfs_write(struct file *filp, const char *buf, size_t count, loff_t *ppo
kdfs_iput(filp->f_dentry->d_inode->i_ino);
DEBUG(DBG_INFO,
- "write to file %s at offset %lld: "
+ "write to file %s at offset %llu: "
"done with return value %zd\n",
filp->f_dentry->d_name.name, *ppos, r);
@@ -139,7 +139,7 @@ int kdfs_open(struct inode *inode, struct file *filp)
struct kdfs_inode *k_inode;
int r = 0;
- DEBUG(DBG_INFO, "open file %s - inode %ld\n",
+ DEBUG(DBG_INFO, "open file %s - inode %lu\n",
filp->f_dentry->d_name.name, inode->i_ino);
k_cwsb = __kdfs_get_cwsb();
@@ -162,7 +162,7 @@ int kdfs_open(struct inode *inode, struct file *filp)
__kdfs_putsb(k_sb);
out:
- DEBUG(DBG_INFO, "open file %s: inode %ld: done with error %d\n",
+ DEBUG(DBG_INFO, "open file %s: inode %lu: done with error %d\n",
filp->f_dentry->d_name.name, inode->i_ino, r);
return r;
@@ -176,7 +176,7 @@ int kdfs_release(struct inode *inode, struct file *filp)
// struct kdfs_inode *k_inode;
DEBUG(DBG_INFO,
- "Release file %s (i_size %lld) (inode %p)\n",
+ "Release file %s (i_size %llu) (inode %p)\n",
filp->f_dentry->d_name.name,
filp->f_dentry->d_inode->i_size,
filp->f_dentry->d_inode);
@@ -231,11 +231,11 @@ kddm_set_t *create_file_kddm_set(struct kdfs_inode *k_inode)
#endif
if (!IS_ERR(kddm_set)) {
k_inode->content_setid=kddm_set->id;
- DEBUG(DBG_INFO, "Create content kddm_set for file %s (inode %ld) with id %lu\n",
+ DEBUG(DBG_INFO, "Create content kddm_set for file %s (inode %lu) with id %lu\n",
list_entry(k_inode->inode->i_dentry.next, struct dentry, d_alias)->d_name.name,
k_inode->inode->i_ino, k_inode->content_setid);
} else {
- DEBUG(DBG_PANIC, "Can't create content kddm_set for file%s (inode %ld)\n",
+ DEBUG(DBG_PANIC, "Can't create content kddm_set for file%s (inode %lu)\n",
list_entry(k_inode->inode->i_dentry.next, struct dentry, d_alias)->d_name.name,
k_inode->inode->i_ino);
}
diff --git a/fs/kdfs/file_extent.c b/fs/kdfs/file_extent.c
index f3c0279..b071718 100644
--- a/fs/kdfs/file_extent.c
+++ b/fs/kdfs/file_extent.c
@@ -213,7 +213,7 @@ kdfs_node_t kdfs_file_extent_get_page_owner(struct kdfs_inode *k_inode, pgoff_t
{
struct kdfs_file_extent *extent_before, *extent_in, *extent_after;
- DEBUG(DBG_INFO, "Try to access the extent of ino : %ld\n",k_inode->inode->i_ino);
+ DEBUG(DBG_INFO, "Try to access the extent of ino : %lu\n",k_inode->inode->i_ino);
kdfs_file_extent_find(&k_inode->extents_list, page_no, &extent_before, &extent_in, &extent_after);
if (extent_in) {
@@ -285,7 +285,7 @@ size_t kdfs_file_extent_read_from_file(struct kdfs_inode *k_inode)
close_phys_file(file);
} else {
DEBUG(DBG_ALERT,
- "Can't access to the KDFS inode %ld\n"
+ "Can't access to the KDFS inode %lu\n"
"Please verify type of the partition %s, it should be a KDFS one",
k_inode->inode->i_ino, ((struct kdfs_super_block*)k_inode->inode->i_sb->s_fs_info)->k_opt->part_name);
}
diff --git a/fs/kdfs/inode.c b/fs/kdfs/inode.c
index 5ebc699..53bde96 100644
--- a/fs/kdfs/inode.c
+++ b/fs/kdfs/inode.c
@@ -37,8 +37,8 @@
void print_inode_cont(struct inode *node)
{
printk("\n\n\n=== INODE DUMP ===\n");
- printk(" i_ino: %ld\n", node->i_ino);
- printk(" i_count: %d\n", node->i_count.counter);
+ printk(" i_ino: %lu\n", node->i_ino);
+ printk(" i_count: %u\n", node->i_count.counter);
printk(" i_nlink: %u\n", node->i_nlink);
printk(" i_uid: %u\n", node->i_uid);
printk(" i_gid: %u\n", node->i_gid);
@@ -135,7 +135,7 @@ struct kdfs_inode *__kdfs_mknod(struct kdfs_inode *k_pdir,
struct kdfs_super_block *k_sb;
DEBUG(DBG_TRACE,
- "Internal mknod %s (parent dir %ld ino)\n",
+ "Internal mknod %s (parent dir %lu ino)\n",
dentry->d_name.name, k_pdir->inode->i_ino);
k_sb = kdfs_grabsb(kerrighed_node_id);
@@ -153,7 +153,7 @@ struct kdfs_inode *__kdfs_mknod(struct kdfs_inode *k_pdir,
k_nnod = kdfs_icreate(ino); /* get a kDFS inode from the kDDM set (k_inode is lock)*/
if (IS_ERR(k_nnod)) {
- DEBUG(DBG_ALERT, "Can't grab new file inode object (ino=%ld)\n", ino);
+ DEBUG(DBG_ALERT, "Can't grab new file inode object (ino=%lu)\n", ino);
return k_nnod;
}
@@ -205,7 +205,7 @@ struct kdfs_inode *__kdfs_mknod(struct kdfs_inode *k_pdir,
DEBUG(DBG_TRACE, "i_count before d_instantiate %d\n", atomic_read(&k_nnod->inode->i_count));
d_instantiate(dentry, k_nnod->inode);
DEBUG(DBG_TRACE, "i_count after d_instantiate %d\n", atomic_read(&k_nnod->inode->i_count));
- DEBUG(DBG_TRACE, "New nod done (ino=%ld, size=%lld)\n", k_nnod->inode->i_ino, k_nnod->inode->i_size);
+ DEBUG(DBG_TRACE, "New nod done (ino=%lu, size=%llu)\n", k_nnod->inode->i_ino, k_nnod->inode->i_size);
return k_nnod;
}
@@ -233,7 +233,7 @@ int kdfs_mknod(struct inode *dir,
struct kdfs_inode *k_pdir, *k_nnod;
DEBUG(DBG_TRACE,
- "New nod %s (parent dir %ld ino)\n",
+ "New nod %s (parent dir %lu ino)\n",
dentry->d_name.name, dir->i_ino);
/* Grab the parent directory */
@@ -245,7 +245,7 @@ int kdfs_mknod(struct inode *dir,
if (k_nnod) {
kdfs_iput(k_nnod->inode->i_ino);
DEBUG(DBG_TRACE,
- "New nod (ino=%ld, size=%lld)\n",
+ "New nod (ino=%lu, size=%llu)\n",
k_nnod->inode->i_ino,k_nnod->inode->i_size);
} else
// TODO PRIORITY 2, Adrien, if we got an error we should release the local inode if needed !
@@ -271,7 +271,7 @@ int kdfs_create(struct inode *dir, struct dentry *dentry,
{
int res = 0;
DEBUG(DBG_TRACE,
- "create %s (parent dir %ld ino)\n",
+ "create %s (parent dir %lu ino)\n",
dentry->d_name.name, dir->i_ino);
res = kdfs_mknod(dir, dentry, mode|S_IFREG, 0);
@@ -296,7 +296,7 @@ int kdfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
struct kdfs_inode *k_pdir, *k_nnod;
DEBUG(DBG_TRACE,
- "mkdir %s (parent dir %ld ino)\n",
+ "mkdir %s (parent dir %lu ino)\n",
dentry->d_name.name, dir->i_ino);
/* Grab the parent directory */
@@ -373,7 +373,7 @@ int kdfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
k_page = kdfs_grab_distpage(k_nnod, 0);
if (IS_ERR(k_page))
DEBUG (DBG_PANIC,
- "Can't grab page for newnode %ld (contentset_id %ld)\n",
+ "Can't grab page for newnode %lu (contentset_id %lu)\n",
k_nnod->inode->i_ino, k_nnod->content_setid);
/* Write the symlink in the page */
@@ -462,7 +462,7 @@ int __kdfs_unlink(struct kdfs_inode *k_pdir, struct dentry *dentry)
retval = kdfs_del_dir_entry(k_pdir, (char *) dentry->d_name.name, dentry->d_inode->i_ino);
if (retval < 0 ) {
DEBUG(DBG_INFO,
- "Cannot delete direntry (file %s) in directory %ld)\n",
+ "Cannot delete direntry (file %s) in directory %lu)\n",
dentry->d_name.name, k_pdir->inode->i_ino);
goto out;
}
@@ -541,7 +541,7 @@ int kdfs_rename (struct inode *cur_dir,
int err = 0;
DEBUG (DBG_TRACE,
- "(Start) move entry %s from directory %ld to %s in directory %ld\n",
+ "(Start) move entry %s from directory %lu to %s in directory %lu\n",
cur_dentry->d_name.name, cur_dir->i_ino,
new_dentry->d_name.name, new_dir->i_ino);
@@ -593,7 +593,7 @@ int kdfs_rename (struct inode *cur_dir,
err = kdfs_del_dir_entry(k_currentdir, (char *) cur_dentry->d_name.name, cur_dentry->d_inode->i_ino);
if (err < 0) {
- DEBUG(DBG_INFO, "Cannot delete direntry (file %s) in directory %ld)\n", cur_dentry->d_name.name, cur_dir->i_ino);
+ DEBUG(DBG_INFO, "Cannot delete direntry (file %s) in directory %lu)\n", cur_dentry->d_name.name, cur_dir->i_ino);
kdfs_iput(cur_dir->i_ino);
kdfs_iput(k_curinode->inode->i_ino);
return err;
@@ -647,7 +647,7 @@ int kdfs_rename (struct inode *cur_dir,
err = kdfs_add_dir_entry(k_newdir, (char *) new_dentry->d_name.name, cur_dentry->d_inode->i_ino, cur_dentry->d_inode->i_mode);
if (err < 0)
DEBUG(DBG_PANIC,
- "Cannot add direntry (file %s) in directory %ld)\n",
+ "Cannot add direntry (file %s) in directory %lu)\n",
new_dentry->d_name.name, new_dir->i_ino);
else {
/* If we are moving a directory we must increment the link count of the new parent... */
@@ -656,7 +656,7 @@ int kdfs_rename (struct inode *cur_dir,
err = kdfs_del_dir_entry(k_currentdir, (char *) cur_dentry->d_name.name, cur_dir->i_ino);
if (err < 0)
DEBUG(DBG_PANIC,
- "Cannot delete direntry (file %s) in directory %ld)\n",
+ "Cannot delete direntry (file %s) in directory %lu)\n",
cur_dentry->d_name.name, cur_dir->i_ino);
else {
/* ... and decrement the link count of the old parent */
@@ -677,11 +677,11 @@ int kdfs_rename (struct inode *cur_dir,
out:
if (err < 0)
- DEBUG(DBG_TRACE, "(Exit) can't move entry %s from directory %ld to %s in directory %ld: (err=%d)\n",
+ DEBUG(DBG_TRACE, "(Exit) can't move entry %s from directory %lu to %s in directory %lu: (err=%d)\n",
cur_dentry->d_name.name, cur_dir->i_ino,
new_dentry->d_name.name, new_dir->i_ino,err);
else
- DEBUG(DBG_TRACE, "(Exit) move entry %s from directory %ld to %s in directory %ld\n",
+ DEBUG(DBG_TRACE, "(Exit) move entry %s from directory %lu to %s in directory %lu\n",
cur_dentry->d_name.name, cur_dir->i_ino,
new_dentry->d_name.name, new_dir->i_ino);
@@ -784,7 +784,7 @@ int kdfs_getattr(struct vfsmount *mnt,
struct kdfs_cw_sb *k_cwsb;
int r = 0;
- DEBUG (DBG_TRACE, "getattr for file %s (inodeid=%ld)\n", dentry->d_name.name,inode->i_ino);
+ DEBUG (DBG_TRACE, "getattr for file %s (inodeid=%lu)\n", dentry->d_name.name,inode->i_ino);
// Check whether the node storing the .meta file is reachable or not
// TODO: Adrien, performance impact ?
@@ -802,7 +802,7 @@ int kdfs_getattr(struct vfsmount *mnt,
//TODO Find a way to determine n for 2^n = (k_inode->inode->i_blkbits/8)
k_inode->inode->i_blocks = (k_inode->inode->i_size >> 9 ) + 1;
DEBUG(DBG_INFO,
- "blocks = %ld, size= %lld, blksize =%d\n",
+ "blocks = %lu, size= %llu, blksize =%d\n",
k_inode->inode->i_blocks, k_inode->inode->i_size, (k_inode->inode->i_blkbits / 8));
/* Build stat fields from the inode */
generic_fillattr(k_inode->inode, stat);
@@ -928,7 +928,7 @@ struct kdfs_inode *kdfs_icreate(unsigned long ino)
/* Release a copy */
void __kdfs_iput(struct kdfs_inode *k_inode)
{
- DEBUG(DBG_INFO, "Inode: %ld, i_count = %d\n", k_inode->inode->i_ino, atomic_read(&k_inode->inode->i_count));
+ DEBUG(DBG_INFO, "Inode: %lu, i_count = %u\n", k_inode->inode->i_ino, atomic_read(&k_inode->inode->i_count));
if (k_inode->flags & K_INODE_DIRTY) {
kddm_sync_frozen_object(kddm_def_ns, KDFS_INODE_KDDM_ID, k_inode->inode->i_ino);
k_inode->flags &= ~K_INODE_DIRTY;
@@ -1027,7 +1027,7 @@ int kdfs_iol_inode_alloc_object (kddm_obj_t *objEntry,
*/
if (objEntry->object == NULL) {
- DEBUG (DBG_INFO, "Alloc inode (%ld;%ld)\n", kddm_set->id, objid);
+ DEBUG (DBG_INFO, "Alloc inode (%lu;%lu)\n", kddm_set->id, objid);
/* Object have been not allocated before */
k_inode = kmalloc(sizeof(struct kdfs_inode), GFP_KERNEL);
ASSERT(k_inode != NULL);
@@ -1048,7 +1048,7 @@ int kdfs_iol_inode_alloc_object (kddm_obj_t *objEntry,
k_inode->flags = K_INODE_INITIALIZING;
if (k_inode->inode == NULL)
- DEBUG(DBG_PANIC, "Cannot find inode %ld\n", objid);
+ DEBUG(DBG_PANIC, "Cannot find inode %lu\n", objid);
k_inode->content_setid = KDDM_SET_UNUSED;
@@ -1056,7 +1056,7 @@ int kdfs_iol_inode_alloc_object (kddm_obj_t *objEntry,
objEntry->object = k_inode;
} else {
/* Object id has been already allocated so reused the same structure */
- DEBUG(DBG_PANIC, "Object %ld was already allocated \n", objid);
+ DEBUG(DBG_PANIC, "Object %lu was already allocated \n", objid);
}
__kdfs_twice_putsb(k_sb);
@@ -1089,7 +1089,7 @@ int kdfs_iol_inode_first_touch(kddm_obj_t *objEntry,
ASSERT(k_sb != NULL);
DEBUG(DBG_TRACE,
- "function ENTER: First touch inode (%ld;%ld) (creation = %d)\n",
+ "function ENTER: First touch inode (%lu;%lu) (creation = %d)\n",
kddm_set->id, objid, (flags & KDDM_CREATE_ON_FT));
k_inode = kmalloc(sizeof(struct kdfs_inode), GFP_KERNEL);
@@ -1109,7 +1109,7 @@ int kdfs_iol_inode_first_touch(kddm_obj_t *objEntry,
k_inode->inode = new_inode (k_sb->sb);
k_inode->flags = K_INODE_CREATING|K_INODE_INITIALIZING;
if (k_inode->inode == NULL)
- DEBUG(DBG_PANIC, "Cannot find inode %ld\n", objid);
+ DEBUG(DBG_PANIC, "Cannot find inode %lu\n", objid);
k_inode->inode->i_ino = objid;
// insert_inode_hash(k_inode->inode);
}
@@ -1143,7 +1143,7 @@ int kdfs_iol_inode_insert_object(kddm_obj_t *objEntry,
{
struct kdfs_inode *k_inode = (struct kdfs_inode *) objEntry->object;
- DEBUG(DBG_INFO, "Insert inode (%ld;%ld)\n", set->id, objid);
+ DEBUG(DBG_INFO, "Insert inode (%lu;%lu)\n", set->id, objid);
/*
* If this is the first insert in the set (just called after the first_touch)
@@ -1177,7 +1177,7 @@ int kdfs_iol_inode_insert_object(kddm_obj_t *objEntry,
break;
default:
DEBUG(DBG_PANIC,
- "Cannot set kdfs inode operations %o (ino %ld)\n",
+ "Cannot set kdfs inode operations %o (ino %lu)\n",
k_inode->inode->i_mode & S_IFMT, k_inode->inode->i_ino);
DEBUG(DBG_PANIC, "filename %s\n",
list_entry(k_inode->inode->i_dentry.next, struct dentry, d_alias)->d_name.name);
@@ -1279,7 +1279,7 @@ int kdfs_iol_inode_invalidate_object(kddm_obj_t *objEntry,
struct kdfs_inode *k_inode;
struct dentry *dentry, *dchild;
- DEBUG(DBG_INFO, "Invalidate inode (%ld;%ld)\n",
+ DEBUG(DBG_INFO, "Invalidate inode (%lu;%lu)\n",
set->id, objid);
k_inode = objEntry->object;
@@ -1318,7 +1318,7 @@ int kdfs_iol_inode_sync_object(kddm_obj_t *objEntry,
struct kdfs_inode *kdfs_inode = NULL;
ASSERT(objEntry != NULL);
- DEBUG(DBG_INFO, "Sync inode %ld\n", objid);
+ DEBUG(DBG_INFO, "Sync inode %lu\n", objid);
kdfs_inode = objEntry->object;
ASSERT(kdfs_inode != NULL);
diff --git a/fs/kdfs/physical_fs.c b/fs/kdfs/physical_fs.c
index f8e1c57..3ce8533 100644
--- a/fs/kdfs/physical_fs.c
+++ b/fs/kdfs/physical_fs.c
@@ -429,7 +429,7 @@ int kdfs_phys_write(struct file *file, char *addr, size_t len, loff_t *pos)
int ret;
mm_segment_t old_fs;
- DEBUG(DBG_INFO, "Write Native file %s to position %lld (size %ld )\n", file->f_dentry->d_name.name, *pos, len);
+ DEBUG(DBG_INFO, "Write Native file %s to position %llu (size %lu )\n", file->f_dentry->d_name.name, *pos, len);
old_fs = get_fs();
set_fs(KERNEL_DS); /* Enable to read in kernel memory */
diff --git a/fs/kdfs/super.c b/fs/kdfs/super.c
index 66ba12d..b52cc3d 100644
--- a/fs/kdfs/super.c
+++ b/fs/kdfs/super.c
@@ -104,19 +104,19 @@ int kdfs_proc_inodes_write(struct file *filp, const char __user *buf,
printk("Dumping s_inodes list\n");
list_for_each_entry(inode, &k_sb->sb->s_inodes, i_sb_list) {
struct kdfs_inode *k_inode = kdfs_iget(inode->i_ino);
- printk(" Inode %ld, count %d, cw_count %d, mode %u, size %lld\n", inode->i_ino,
+ printk(" Inode %lu, count %d, cw_count %d, mode %u, size %llu\n", inode->i_ino,
atomic_read(&inode->i_count), atomic_read(&k_inode->cw_count), inode->i_mode, inode->i_size);
kdfs_iput(inode->i_ino);
}
printk("Dumping s_dirty list\n");
list_for_each_entry(inode, &k_sb->sb->s_dirty, i_list)
- printk(" Inode %ld, count %d, mode %u, size %lld\n", inode->i_ino, atomic_read(&inode->i_count), inode->i_mode, inode->i_size);
+ printk(" Inode %lu, count %d, mode %u, size %llu\n", inode->i_ino, atomic_read(&inode->i_count), inode->i_mode, inode->i_size);
printk("Dumping s_io list\n");
list_for_each_entry(inode, &k_sb->sb->s_io, i_list)
- printk(" Inode %ld, count %d, mode %u, size %lld\n", inode->i_ino, atomic_read(&inode->i_count), inode->i_mode, inode->i_size);
+ printk(" Inode %lu, count %d, mode %u, size %llu\n", inode->i_ino, atomic_read(&inode->i_count), inode->i_mode, inode->i_size);
printk("Dumping s_files list\n");
list_for_each_entry(file, &k_sb->sb->s_files, f_u.fu_list)
- printk(" File with count %ld", atomic_read(&file->f_count));
+ printk(" File with count %lu", atomic_read(&file->f_count));
}
else
printk("There is no kDFS superblock file on the current node\n");
@@ -179,7 +179,7 @@ int __kdfs_fill_sb(struct kdfs_super_block *k_sb)
}
/* Get root_nodeid */
- DEBUG(DBG_INFO, "file name %s, file position %lld \n",
+ DEBUG(DBG_INFO, "file name %s, file position %llu \n",
k_sb->sb_file->f_dentry->d_name.name, k_sb->sb_file->f_pos);
res = kdfs_phys_read(k_sb->sb_file, (char *) &k_sb->root_nodeid,
@@ -204,7 +204,7 @@ int __kdfs_fill_sb(struct kdfs_super_block *k_sb)
/* Load the complete bitmap */
res = sb_bitmap_load(k_sb->sb_file, k_sb->sb_file->f_pos, k_sb);
- DEBUG(DBG_INFO, "BMP size: %ld\n\n", k_sb->inode_bitmap->size);
+ DEBUG(DBG_INFO, "BMP size: %lu\n\n", k_sb->inode_bitmap->size);
if (res == -1) {
DEBUG (DBG_PANIC, "You're using an old version of kDFS superblock file\n");
close_phys_file(k_sb->sb_file);
@@ -260,7 +260,7 @@ ino_t kdfs_get_freeino(struct kdfs_super_block *k_sb)
goto out;
}
- DEBUG(DBG_INFO, "Allocated inode #%ld\n", ino);
+ DEBUG(DBG_INFO, "Allocated inode #%lu\n", ino);
DEBUG(DBG_INFO, "Next free inode #: %lu\n",
sb_bitmap_get_available(k_sb));
@@ -296,7 +296,7 @@ void kdfs_remove_local_ino(struct kdfs_super_block *k_sb, unsigned long ino)
int res = 0;
PRINT_FUNCTION_NAME;
- DEBUG(DBG_INFO, "free inode: %ld\n", ino);
+ DEBUG(DBG_INFO, "free inode: %lu\n", ino);
BUG_ON(inode_linked_node(ino) != kerrighed_node_id);
@@ -409,9 +409,9 @@ void kdfs_getphysicalpath(struct kdfs_super_block *k_sb, unsigned long ino,
/* Find the physical path corresponding to the KDFS inode */
tmp_ino = KDFS_EXTRACT_INO(ino);
tmp_nodeid = inode_linked_node(ino);
- sprintf(phys_filename, "%s%d/%ld-%ld/%ld", k_sb->k_opt->part_name, tmp_nodeid,
+ sprintf(phys_filename, "%s%d/%lu-%lu/%lu", k_sb->k_opt->part_name, tmp_nodeid,
(unsigned long)(tmp_ino / 100) * 100, (unsigned long)(tmp_ino / 100) * 100 + 99, tmp_ino);
- DEBUG(DBG_INFO, "function EXIT: Physical file for inode %ld: %s\n", ino, phys_filename);
+ DEBUG(DBG_INFO, "function EXIT: Physical file for inode %lu: %s\n", ino, phys_filename);
}
/*
@@ -1048,7 +1048,7 @@ int kdfs_fill_kinode(struct super_block *sb, unsigned long ino, struct kdfs_inod
}
else
DEBUG(DBG_ALERT,
- "Can't access to the KDFS inode %ld\n"
+ "Can't access to the KDFS inode %lu\n"
"Please verify type of the partition %s, it should be a KDFS one",
k_inode->inode->i_ino, ((struct kdfs_super_block*)k_inode->inode->i_sb->s_fs_info)->k_opt->part_name);
@@ -1115,7 +1115,7 @@ int __kdfs_write_inode(struct kdfs_inode *k_inode)
close_phys_file(file);
} else {
DEBUG (DBG_PANIC,
- "Can't access/create the KDFS inode %ld metafile \nPlease "\
+ "Can't access/create the KDFS inode %lu metafile \nPlease "\
"verify type of the partition %s, it should be a KDFS one "\
" (error %ld)\n", inode->i_ino,
((struct kdfs_super_block*)inode->i_sb->s_fs_info)->k_opt->part_name,
@@ -1140,7 +1140,7 @@ int __kdfs_write_inode(struct kdfs_inode *k_inode)
void kdfs_drop_inode(struct inode *inode)
{
long ino = inode->i_ino;
- DEBUG(DBG_INFO, "inode id %ld\n", ino);
+ DEBUG(DBG_INFO, "inode id %lu\n", ino);
if (inode->i_nlink) {
/* Generic forget is unfortunately not exported unfortunately */
@@ -1180,7 +1180,7 @@ void kdfs_delete_inode(struct inode *inode)
struct kdfs_inode *k_inode = NULL;
struct kdfs_super_block *k_sb = NULL;
- DEBUG(DBG_INFO, "Delete Inode %ld\n", inode->i_ino);
+ DEBUG(DBG_INFO, "Delete Inode %lu\n", inode->i_ino);
k_sb = kdfs_getsb(kerrighed_node_id);
/* Get the inode and delete its associated content set and its entry in INODE KDDM Set */
@@ -1204,7 +1204,7 @@ DEBUG(DBG_INFO, "kdfs uninstantiate has been called now it idelete\n");
/* Cleanly remove inode from kddm inode set */
kdfs_idelete(inode->i_ino); // equivalent to kdfs_iput() and remove
- DEBUG(DBG_INFO, "Freeing i_ino %ld from the bitmap\n", inode->i_ino);
+ DEBUG(DBG_INFO, "Freeing i_ino %lu from the bitmap\n", inode->i_ino);
if (inode_linked_node(inode->i_ino) == kerrighed_node_id) {
/* Close the physical file before it is removed in kdfs_remove_local_ino */
@@ -1395,7 +1395,7 @@ int kdfs_fill_super(struct kdfs_super_block *k_sb, void *data, int silent)
/* Get root inode */
kdfs_root_inode = kdfs_iget(KDFS_COMPUTE_ROOT_INODEID(k_sb));
/* Create the root dentry */
- DEBUG(DBG_INFO, "KDFS: root inodeid %ld\n", kdfs_root_inode->inode->i_ino);
+ DEBUG(DBG_INFO, "KDFS: root inodeid %lu\n", kdfs_root_inode->inode->i_ino);
root_dentry = d_alloc_root(kdfs_root_inode->inode);
/* Release the root_inode if we can't create the related dentry */
@@ -1823,7 +1823,7 @@ struct kdfs_super_block *__kdfs_sb_alloc(unsigned long nodeid)
int kdfs_iol_sb_alloc(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid)
{
int res = 0;
- DEBUG (DBG_INFO, "Alloc superbloc (%ld)\n", objid);
+ DEBUG (DBG_INFO, "Alloc superbloc (%lu)\n", objid);
if (!objEntry->object) {
struct kdfs_generic_sb *kgsb = kmalloc(sizeof(*kgsb), GFP_KERNEL);
@@ -1841,7 +1841,7 @@ int kdfs_iol_sb_alloc(kddm_obj_t *objEntry, kddm_set_t *set, objid_t objid)
objEntry->object = kgsb;
} else {
/* Object id has been already allocated so reuse the same structure */
- DEBUG(DBG_PANIC, "Object %ld was already allocated \n", objid);
+ DEBUG(DBG_PANIC, "Object %lu was already allocated \n", objid);
}
PRINT_FUNCTION_EXIT;
@@ -1864,7 +1864,7 @@ int kdfs_iol_sb_first_touch (kddm_obj_t *objEntry,
objid_t objid, int flags)
{
int res = 0;
- DEBUG (DBG_INFO, "First touch sb (%ld;%ld)\n",
+ DEBUG (DBG_INFO, "First touch sb (%lu;%lu)\n",
kddm_set->id, objid);
if (!objEntry->object) {
struct kdfs_generic_sb *kgsb = kmalloc(sizeof(*kgsb), GFP_KERNEL);
@@ -1882,7 +1882,7 @@ int kdfs_iol_sb_first_touch (kddm_obj_t *objEntry,
objEntry->object = kgsb;
} else {
/* Object id has been already allocated so reused the same structure */
- DEBUG (DBG_PANIC, "Object %ld was already allocated \n",objid);
+ DEBUG (DBG_PANIC, "Object %lu was already allocated \n",objid);
}
PRINT_FUNCTION_EXIT;
@@ -2152,7 +2152,7 @@ int kdfs_iol_sb_sync_object (kddm_obj_t *objEntry,
ASSERT(objEntry != NULL);
- DEBUG(DBG_INFO, "Sync superblock (sbid=%ld)\n", objid);
+ DEBUG(DBG_INFO, "Sync superblock (sbid=%lu)\n", objid);
kgsb = objEntry->object;
if (objid != KDFS_CWSB_ID) {
-----------------------------------------------------------------------
Summary of changes:
fs/kdfs/address_space.c | 58 +++++++++++++++++++++++-----------------------
fs/kdfs/dir.c | 54 +++++++++++++++++++++---------------------
fs/kdfs/file.c | 22 +++++++++---------
fs/kdfs/file_extent.c | 4 +-
fs/kdfs/inode.c | 58 +++++++++++++++++++++++-----------------------
fs/kdfs/physical_fs.c | 2 +-
fs/kdfs/super.c | 42 +++++++++++++++++-----------------
7 files changed, 120 insertions(+), 120 deletions(-)
hooks/post-receive
--
kdfs
|
