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

Commit 1cb0c924 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: wait for discard to finish 



nilfs_discard_segment() doesn't wait for completion of discard
requests.  This specifies BLKDEV_IFL_WAIT flag when calling
blkdev_issue_discard() in order to fix the sync failure.

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@lst.de>
parent 3b89f567

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;

}