diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:14:00 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:14:00 +0900 |
| commit | 0a66a59649f8d3f09a0ca77f1a232ec77adeeda2 (patch) | |
| tree | b5ff28c25204a40d8080e8adb28093c6926b5102 /fs | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging (diff) | |
| parent | nilfs2: fix typo in comment of nilfs_dat_move function (diff) | |
| download | linux-dev-0a66a59649f8d3f09a0ca77f1a232ec77adeeda2.tar.xz linux-dev-0a66a59649f8d3f09a0ca77f1a232ec77adeeda2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix typo in comment of nilfs_dat_move function
nilfs2: nilfs_iget_for_gc() returns ERR_PTR
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/dat.c | 2 | ||||
| -rw-r--r-- | fs/nilfs2/ioctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c index 49c844dab33a..59e5fe742f7b 100644 --- a/fs/nilfs2/dat.c +++ b/fs/nilfs2/dat.c @@ -335,7 +335,7 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr) * the device at this point. * * To prevent nilfs_dat_translate() from returning the - * uncommited block number, this makes a copy of the entry + * uncommitted block number, this makes a copy of the entry * buffer and redirects nilfs_dat_translate() to the copy. */ if (!buffer_nilfs_redirected(entry_bh)) { diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 3e90f86d5bfe..e00d9457c256 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -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 { |