mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

iomap: ignore non-shared or non-data blocks in xfs_file_dirty

Browse source 
xfs_file_dirty is used to unshare reflink blocks.  Rename the function
to xfs_file_unshare to better document that purpose, and skip iomaps
that are not shared and don't need zeroing.  This will allow to simplify
the caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2019-10-18 16:41:34 -07:00 committed by Darrick J. Wong
parent dcd6158d15
commit 3590c4d897
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/iomap/buffered-io.c
View file

@ -887,12 +887,19 @@ __iomap_read_page(struct inode *inode, loff_t offset)
} }
static loff_t static loff_t
iomap_dirty_actor(struct inode *inode, loff_t pos, loff_t length, void *data, iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
struct iomap *iomap) struct iomap *iomap)
{ {
long status = 0; long status = 0;
ssize_t written = 0; ssize_t written = 0;
/* don't bother with blocks that are not shared to start with */
if (!(iomap->flags & IOMAP_F_SHARED))
return length;
/* don't bother with holes or unwritten extents */
if (iomap->type == IOMAP_HOLE || iomap->type == IOMAP_UNWRITTEN)
return length;
do { do {
struct page *page, *rpage; struct page *page, *rpage;
unsigned long offset; /* Offset into pagecache page */ unsigned long offset; /* Offset into pagecache page */
@ -932,14 +939,14 @@ iomap_dirty_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
} }
int int
iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len, iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
const struct iomap_ops *ops) const struct iomap_ops *ops)
{ {
loff_t ret; loff_t ret;
while (len) { while (len) {
ret = iomap_apply(inode, pos, len, IOMAP_WRITE, ops, NULL, ret = iomap_apply(inode, pos, len, IOMAP_WRITE, ops, NULL,
iomap_dirty_actor); iomap_unshare_actor);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
pos += ret; pos += ret;
@ -948,7 +955,7 @@ iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(iomap_file_dirty); EXPORT_SYMBOL_GPL(iomap_file_unshare);
static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset,
unsigned bytes, struct iomap *iomap) unsigned bytes, struct iomap *iomap)

2
fs/xfs/xfs_reflink.c
View file

@ -1442,7 +1442,7 @@ xfs_reflink_dirty_extents(
flen = XFS_FSB_TO_B(mp, rlen); flen = XFS_FSB_TO_B(mp, rlen);
if (fpos + flen > isize) if (fpos + flen > isize)
flen = isize - fpos; flen = isize - fpos;
error = iomap_file_dirty(VFS_I(ip), fpos, flen, error = iomap_file_unshare(VFS_I(ip), fpos, flen,
&xfs_iomap_ops); &xfs_iomap_ops);
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);
if (error) if (error)

2
include/linux/iomap.h
View file

@ -168,7 +168,7 @@ int iomap_migrate_page(struct address_space *mapping, struct page *newpage,
#else #else
#define iomap_migrate_page NULL #define iomap_migrate_page NULL
#endif #endif
int iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len, int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
const struct iomap_ops *ops); const struct iomap_ops *ops);
int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
bool *did_zero, const struct iomap_ops *ops); bool *did_zero, const struct iomap_ops *ops);