mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks
This is practically generic code; other filesystems will want to call it from other places, but there's nothing ext2-specific about it. Make it a little more generic by allowing it to take a count of the number of bytes to zero rather than fixing it to a single page. Thanks to Dave Hansen for suggesting that I need to call cond_resched() if zeroing more than one page. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Cc: Boaz Harrosh <boaz@plexistor.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Dave Chinner <david@fromorbit.com> Cc: Jan Kara <jack@suse.cz> Cc: Jens Axboe <axboe@kernel.dk> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d475c6346a
commit
289c6aedac
5 changed files with 43 additions and 20 deletions
37
fs/dax.c
37
fs/dax.c
|
@ -20,8 +20,45 @@
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/genhd.h>
|
#include <linux/genhd.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/sched.h>
|
||||||
#include <linux/uio.h>
|
#include <linux/uio.h>
|
||||||
|
|
||||||
|
int dax_clear_blocks(struct inode *inode, sector_t block, long size)
|
||||||
|
{
|
||||||
|
struct block_device *bdev = inode->i_sb->s_bdev;
|
||||||
|
sector_t sector = block << (inode->i_blkbits - 9);
|
||||||
|
|
||||||
|
might_sleep();
|
||||||
|
do {
|
||||||
|
void *addr;
|
||||||
|
unsigned long pfn;
|
||||||
|
long count;
|
||||||
|
|
||||||
|
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;
|
||||||
|
if (pgsz < PAGE_SIZE)
|
||||||
|
memset(addr, 0, pgsz);
|
||||||
|
else
|
||||||
|
clear_page(addr);
|
||||||
|
addr += pgsz;
|
||||||
|
size -= pgsz;
|
||||||
|
count -= pgsz;
|
||||||
|
BUG_ON(pgsz & 511);
|
||||||
|
sector += pgsz / 512;
|
||||||
|
cond_resched();
|
||||||
|
}
|
||||||
|
} while (size);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(dax_clear_blocks);
|
||||||
|
|
||||||
static long dax_get_addr(struct buffer_head *bh, void **addr, unsigned blkbits)
|
static long dax_get_addr(struct buffer_head *bh, void **addr, unsigned blkbits)
|
||||||
{
|
{
|
||||||
unsigned long pfn;
|
unsigned long pfn;
|
||||||
|
|
|
@ -733,10 +733,12 @@ static int ext2_get_blocks(struct inode *inode,
|
||||||
|
|
||||||
if (IS_DAX(inode)) {
|
if (IS_DAX(inode)) {
|
||||||
/*
|
/*
|
||||||
* we need to clear the block
|
* block must be initialised before we put it in the tree
|
||||||
|
* so that it's not found by another thread before it's
|
||||||
|
* initialised
|
||||||
*/
|
*/
|
||||||
err = ext2_clear_xip_target (inode,
|
err = dax_clear_blocks(inode, le32_to_cpu(chain[depth-1].key),
|
||||||
le32_to_cpu(chain[depth-1].key));
|
1 << inode->i_blkbits);
|
||||||
if (err) {
|
if (err) {
|
||||||
mutex_unlock(&ei->truncate_mutex);
|
mutex_unlock(&ei->truncate_mutex);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
|
@ -42,20 +42,6 @@ __ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
ext2_clear_xip_target(struct inode *inode, sector_t block)
|
|
||||||
{
|
|
||||||
void *kaddr;
|
|
||||||
unsigned long pfn;
|
|
||||||
long size;
|
|
||||||
|
|
||||||
size = __inode_direct_access(inode, block, &kaddr, &pfn, PAGE_SIZE);
|
|
||||||
if (size < 0)
|
|
||||||
return size;
|
|
||||||
clear_page(kaddr);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ext2_xip_verify_sb(struct super_block *sb)
|
void ext2_xip_verify_sb(struct super_block *sb)
|
||||||
{
|
{
|
||||||
struct ext2_sb_info *sbi = EXT2_SB(sb);
|
struct ext2_sb_info *sbi = EXT2_SB(sb);
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
|
|
||||||
#ifdef CONFIG_EXT2_FS_XIP
|
#ifdef CONFIG_EXT2_FS_XIP
|
||||||
extern void ext2_xip_verify_sb (struct super_block *);
|
extern void ext2_xip_verify_sb (struct super_block *);
|
||||||
extern int ext2_clear_xip_target (struct inode *, sector_t);
|
|
||||||
|
|
||||||
static inline int ext2_use_xip (struct super_block *sb)
|
static inline int ext2_use_xip (struct super_block *sb)
|
||||||
{
|
{
|
||||||
struct ext2_sb_info *sbi = EXT2_SB(sb);
|
struct ext2_sb_info *sbi = EXT2_SB(sb);
|
||||||
|
@ -19,6 +17,5 @@ int ext2_get_xip_mem(struct address_space *, pgoff_t, int,
|
||||||
#else
|
#else
|
||||||
#define ext2_xip_verify_sb(sb) do { } while (0)
|
#define ext2_xip_verify_sb(sb) do { } while (0)
|
||||||
#define ext2_use_xip(sb) 0
|
#define ext2_use_xip(sb) 0
|
||||||
#define ext2_clear_xip_target(inode, chain) 0
|
|
||||||
#define ext2_get_xip_mem NULL
|
#define ext2_get_xip_mem NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2589,6 +2589,7 @@ extern int nonseekable_open(struct inode * inode, struct file * filp);
|
||||||
|
|
||||||
ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *,
|
ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *,
|
||||||
loff_t, get_block_t, dio_iodone_t, int flags);
|
loff_t, get_block_t, dio_iodone_t, int flags);
|
||||||
|
int dax_clear_blocks(struct inode *, sector_t block, long size);
|
||||||
|
|
||||||
#ifdef CONFIG_FS_XIP
|
#ifdef CONFIG_FS_XIP
|
||||||
extern int xip_file_mmap(struct file * file, struct vm_area_struct * vma);
|
extern int xip_file_mmap(struct file * file, struct vm_area_struct * vma);
|
||||||
|
|
Loading…
Reference in a new issue