]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
nilfs2: nilfs_iget_for_gc() returns ERR_PTR
authorDan Carpenter <error27@gmail.com>
Tue, 23 Nov 2010 06:26:02 +0000 (09:26 +0300)
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Tue, 23 Nov 2010 07:32:19 +0000 (16:32 +0900)
nilfs_iget_for_gc() returns an ERR_PTR() on failure and doesn't return
NULL.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
fs/nilfs2/ioctl.c

index 3e90f86d5bfeeaae741f3475a32ebe7666e46aa7..e00d9457c256179279b141868d6ed86494dec24e 100644 (file)
@@ -349,8 +349,8 @@ static int nilfs_ioctl_move_blocks(struct super_block *sb,
                ino = vdesc->vd_ino;
                cno = vdesc->vd_cno;
                inode = nilfs_iget_for_gc(sb, ino, cno);
-               if (unlikely(inode == NULL)) {
-                       ret = -ENOMEM;
+               if (IS_ERR(inode)) {
+                       ret = PTR_ERR(inode);
                        goto failed;
                }
                do {