Changeset d4d2954 in mainline

Timestamp:

2011-11-27T12:22:52Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1e48a07e

Parents:

e5f8762

Message:

previous revision cannot be compiled - fixed

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (8 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -382 +382 @@
 int ext4fs_destroy_node(fs_node_t *fn)
 {
-        EXT4FS_DBG("");
-
         int rc;
 
@@ -403 +401 @@
         ext4_inode_ref_t *inode_ref = enode->inode_ref;
 
-        EXT4FS_DBG("destroying \%u", inode_ref->index);
+//      EXT4FS_DBG("destroying \%u", inode_ref->index);
 
         rc = ext4_filesystem_truncate_inode(fs, inode_ref, 0);
@@ -433 +431 @@
 int ext4fs_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
-        EXT4FS_DBG("unlinking \%s", name);
+//      EXT4FS_DBG("unlinking \%s", name);
 
         int rc;
@@ -463 +461 @@
 
         uint32_t lnk_count = ext4_inode_get_links_count(child_inode_ref->inode);
-        EXT4FS_DBG("link count before == \%u", lnk_count);
         lnk_count--;
 
@@ -476 +473 @@
                                 parent_inode_ref->inode);
 
-                EXT4FS_DBG("directory will be removed, parent link count = \%u", parent_lnk_count);
-
                 parent_lnk_count--;
                 ext4_inode_set_links_count(parent_inode_ref->inode, parent_lnk_count);
@@ -486 +481 @@
         ext4_inode_set_links_count(child_inode_ref->inode, lnk_count);
         child_inode_ref->dirty = true;
-
-        EXT4FS_DBG("link count after == \%u", lnk_count);
 
         return EOK;
@@ -562 +555 @@
 unsigned ext4fs_lnkcnt_get(fs_node_t *fn)
 {
+        ext4fs_node_t *enode = EXT4FS_NODE(fn);
+        uint32_t lnkcnt = ext4_inode_get_links_count(enode->inode_ref->inode);
+
         if (ext4fs_is_directory(fn)) {
                 if (lnkcnt > 1) {
-                        EXT4FS_DBG("dir: returning \%u", 1);
                         return 1;
                 } else {
-                        EXT4FS_DBG("dir: returning \%u", 0);
                         return 0;
                 }
@@ -573 +567 @@
 
         // For regular files return real links count
-        ext4fs_node_t *enode = EXT4FS_NODE(fn);
-        return ext4_inode_get_links_count(enode->inode_ref->inode);
+        return lnkcnt;
 }