Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a66a596 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 698fd6a2 f6c26ec5

fs/nilfs2/dat.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

fs/nilfs2/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {