Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-1
+3
-1
fs/nilfs2/the_nilfs.c
+3
-1
fs/nilfs2/the_nilfs.c
···
775
775
start * sects_per_block,
776
776
nblocks * sects_per_block,
777
777
GFP_NOFS,
778
+
BLKDEV_IFL_WAIT |
778
779
BLKDEV_IFL_BARRIER);
779
780
if (ret < 0)
780
781
return ret;
···
786
785
ret = blkdev_issue_discard(nilfs->ns_bdev,
787
786
start * sects_per_block,
788
787
nblocks * sects_per_block,
789
-
GFP_NOFS, BLKDEV_IFL_BARRIER);
788
+
GFP_NOFS,
789
+
BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
790
790
return ret;
791
791
}
792
792