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

Commit a28e0852 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: wait for discard to finish
parents e36c886a 1cb0c924

fs/nilfs2/the_nilfs.c

+3 −1
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, 
						   start * sects_per_block,

						   nblocks * sects_per_block,

						   GFP_NOFS,

						   BLKDEV_IFL_WAIT |

						   BLKDEV_IFL_BARRIER);

			if (ret < 0)

				return ret;
@@ -785,7 +786,8 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, 
		ret = blkdev_issue_discard(nilfs->ns_bdev,

					   start * sects_per_block,

					   nblocks * sects_per_block,

					   GFP_NOFS, BLKDEV_IFL_BARRIER);

					   GFP_NOFS,

					  BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);

	return ret;

}