Skip to content

Remove aops->launder_folio - #129

Open
blktests-ci-block-trial[bot] wants to merge 1 commit into
for-next_basefrom
series/680=>for-next
Open

Remove aops->launder_folio#129
blktests-ci-block-trial[bot] wants to merge 1 commit into
for-next_basefrom
series/680=>for-next

Conversation

@blktests-ci-block-trial

Copy link
Copy Markdown

Pull request for series with
subject: Remove aops->launder_folio
version: 1
url: http://redsun45:8000/project/linux-block/list/?series=680

@blktests-ci-block-trial

Copy link
Copy Markdown
Author

Upstream branch: a33221f
series: http://redsun45:8000/project/linux-block/list/?series=680
version: 1

Pull request is NOT updated. Failed to apply http://redsun45:8000/project/linux-block/list/?series=680
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: filemap: Export filemap_invalidate_pages() to modules
Using index info to reconstruct a base tree...
M	block/ioctl.c
M	mm/filemap.c
Falling back to patching base and 3-way merge...
Auto-merging block/ioctl.c
CONFLICT (content): Merge conflict in block/ioctl.c
Auto-merging mm/filemap.c
Patch failed at 0001 filemap: Export filemap_invalidate_pages() to modules'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc block/ioctl.c
index 64b4e6c0f696,db5238b817b4..000000000000
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@@ -908,10 -908,16 +908,23 @@@ static int blkdev_cmd_discard(struct io
  	if (err)
  		return err;
  
++<<<<<<< HEAD
 +	err = filemap_invalidate_pages(bdev->bd_mapping, bic->start,
 +				       bic->start + bic->len - 1, bic->nowait);
 +	if (err)
 +		return err;
++=======
+ 	if (nowait) {
+ 		if (filemap_range_has_page(bdev->bd_mapping, start,
+ 					start + len - 1))
+ 			return -EAGAIN;
+ 	} else {
+ 		err = filemap_invalidate_pages(bdev->bd_mapping, start,
+ 					start + len - 1);
+ 		if (err)
+ 			return err;
+ 	}
++>>>>>>> filemap: Export filemap_invalidate_pages() to modules
  
  	while (true) {
  		bio = blk_alloc_discard_bio(bdev, &sector, &nr_sects, gfp);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant