Merge tag 'omap-for-v3.17/soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / fs / f2fs / debug.c

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index b52c12c..a441ba3 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -167,7 +167,7 @@ get_cache:
        si->cache_mem += npages << PAGE_CACHE_SHIFT;
        npages = META_MAPPING(sbi)->nrpages;
        si->cache_mem += npages << PAGE_CACHE_SHIFT;
-       si->cache_mem += sbi->n_orphans * sizeof(struct orphan_inode_entry);
+       si->cache_mem += sbi->n_orphans * sizeof(struct ino_entry);
        si->cache_mem += sbi->n_dirty_dirs * sizeof(struct dir_inode_entry);
 }
 
@@ -345,21 +345,14 @@ void __init f2fs_create_root_stats(void)
 
        f2fs_debugfs_root = debugfs_create_dir("f2fs", NULL);
        if (!f2fs_debugfs_root)
-               goto bail;
+               return;
 
        file = debugfs_create_file("status", S_IRUGO, f2fs_debugfs_root,
                        NULL, &stat_fops);
-       if (!file)
-               goto free_debugfs_dir;
-
-       return;
-
-free_debugfs_dir:
-       debugfs_remove(f2fs_debugfs_root);
-
-bail:
-       f2fs_debugfs_root = NULL;
-       return;
+       if (!file) {
+               debugfs_remove(f2fs_debugfs_root);
+               f2fs_debugfs_root = NULL;
+       }
 }
 
 void f2fs_destroy_root_stats(void)