Commit 96f8d8e0 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

brd: return -ENOSPC rather than -ENOMEM on page allocation failure



brd is effectively a thinly provisioned device.  Thinly provisioned
devices return -ENOSPC when they can't write a new block.  -ENOMEM is an
implementation detail that callers shouldn't know.
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: default avatarDave Chinner <david@fromorbit.com>
Cc: Dheeraj Reddy <dheeraj.reddy@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a72132c3
...@@ -200,11 +200,11 @@ static int copy_to_brd_setup(struct brd_device *brd, sector_t sector, size_t n) ...@@ -200,11 +200,11 @@ static int copy_to_brd_setup(struct brd_device *brd, sector_t sector, size_t n)
copy = min_t(size_t, n, PAGE_SIZE - offset); copy = min_t(size_t, n, PAGE_SIZE - offset);
if (!brd_insert_page(brd, sector)) if (!brd_insert_page(brd, sector))
return -ENOMEM; return -ENOSPC;
if (copy < n) { if (copy < n) {
sector += copy >> SECTOR_SHIFT; sector += copy >> SECTOR_SHIFT;
if (!brd_insert_page(brd, sector)) if (!brd_insert_page(brd, sector))
return -ENOMEM; return -ENOSPC;
} }
return 0; return 0;
} }
...@@ -384,7 +384,7 @@ static int brd_direct_access(struct block_device *bdev, sector_t sector, ...@@ -384,7 +384,7 @@ static int brd_direct_access(struct block_device *bdev, sector_t sector,
return -ERANGE; return -ERANGE;
page = brd_insert_page(brd, sector); page = brd_insert_page(brd, sector);
if (!page) if (!page)
return -ENOMEM; return -ENOSPC;
*kaddr = page_address(page); *kaddr = page_address(page);
*pfn = page_to_pfn(page); *pfn = page_to_pfn(page);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment