reiserfs: fix dereference of ERR_PTR

[linux-2.6-block.git] / fs / reiserfs / super.c

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 4a62fe8cc3bff619516fbe15d62a8cfaa1aaa581..c0306ec8ed7b8f5d4eef97fd1cf4c7653c2b1f20 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -288,7 +288,7 @@ static int finish_unfinished(struct super_block *s)
                pathrelse(&path);
 
                inode = reiserfs_iget(s, &obj_key);
-               if (!inode) {
+               if (IS_ERR_OR_NULL(inode)) {
                        /*
                         * the unlink almost completed, it just did not
                         * manage to remove "save" link and release objectid
@@ -626,7 +626,8 @@ static int __init init_inodecache(void)
                                                  sizeof(struct
                                                         reiserfs_inode_info),
                                                  0, (SLAB_RECLAIM_ACCOUNT|
-                                                       SLAB_MEM_SPREAD),
+                                                     SLAB_MEM_SPREAD|
+                                                     SLAB_ACCOUNT),
                                                  init_once);
        if (reiserfs_inode_cachep == NULL)
                return -ENOMEM;