|
@@ -28,6 +28,7 @@
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/uio.h>
|
|
|
#include <linux/vmstat.h>
|
|
|
+#include <linux/sizes.h>
|
|
|
|
|
|
/*
|
|
|
* dax_clear_blocks() is called from within transaction context from XFS,
|
|
@@ -43,24 +44,17 @@ int dax_clear_blocks(struct inode *inode, sector_t block, long size)
|
|
|
do {
|
|
|
void __pmem *addr;
|
|
|
unsigned long pfn;
|
|
|
- long count;
|
|
|
+ long count, sz;
|
|
|
|
|
|
count = bdev_direct_access(bdev, sector, &addr, &pfn, size);
|
|
|
if (count < 0)
|
|
|
return count;
|
|
|
- BUG_ON(size < count);
|
|
|
- while (count > 0) {
|
|
|
- unsigned pgsz = PAGE_SIZE - offset_in_page(addr);
|
|
|
- if (pgsz > count)
|
|
|
- pgsz = count;
|
|
|
- clear_pmem(addr, pgsz);
|
|
|
- addr += pgsz;
|
|
|
- size -= pgsz;
|
|
|
- count -= pgsz;
|
|
|
- BUG_ON(pgsz & 511);
|
|
|
- sector += pgsz / 512;
|
|
|
- cond_resched();
|
|
|
- }
|
|
|
+ sz = min_t(long, count, SZ_128K);
|
|
|
+ clear_pmem(addr, sz);
|
|
|
+ size -= sz;
|
|
|
+ BUG_ON(sz & 511);
|
|
|
+ sector += sz / 512;
|
|
|
+ cond_resched();
|
|
|
} while (size);
|
|
|
|
|
|
wmb_pmem();
|