leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regressions in patch Implement iomap for block_map

Browse Source 
This tag is meant for pulling a patch called gfs2: Fixes to
 "Implement iomap for block_map". The patch fixes some
 regressions we recently discovered in commit 3974320ca6.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJahFiJAAoJENeLYdPf93o7JKYH/irlIZM7NPHhiOcot1lXG6HL
 x1fV9u6Rjw7QimctgM6ks1lu/R7hamNvOCAPz7TFXIo0grWes2qOcZa7tdWqkpZK
 TGmSIv+NfrI9NzB3PwleImClfHR8SOgIh/ZlvHQWu9JvKkPlZ3Ik0mZCXbzUFn0I
 Q5ebe+yvaaGeU3QUzsdBgTWuYRE0uQfIylyTz7f8wc9PDp2zB2l01CCCbat/VEWe
 Jy1HlXSiQsmR0N5ypm5d3AszXJ0zbHfjQzKpNACP59WrRjnKvxsBan7En5pQBFnP
 lhLWClqxgtXlvmSb4Takw+Cu9aS2zCYizQ8eqecX5FKQp1Vufoxs48EqRnq55IY=
 =vJqP
 -----END PGP SIGNATURE-----

Merge tag 'gfs2-4.16.rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 fix from Bob Peterson:
 "Fix regressions in the gfs2 iomap for block_map implementation we
  recently discovered in commit 3974320ca6"

* tag 'gfs2-4.16.rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fixes to "Implement iomap for block_map"
This commit is contained in:
Linus Torvalds 2018-02-14 10:14:59 -08:00
commit 6556677a80
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fs/gfs2/bmap.c
View File

@ -716,7 +716,7 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
__be64 *ptr; __be64 *ptr;
sector_t lblock; sector_t lblock;
sector_t lend; sector_t lend;
int ret; int ret = 0;
int eob; int eob;
unsigned int len; unsigned int len;
struct buffer_head *bh; struct buffer_head *bh;
@ -728,12 +728,14 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
goto out; goto out;
} }
if ((flags & IOMAP_REPORT) && gfs2_is_stuffed(ip)) { if (gfs2_is_stuffed(ip)) {
gfs2_stuffed_iomap(inode, iomap); if (flags & IOMAP_REPORT) {
if (pos >= iomap->length) gfs2_stuffed_iomap(inode, iomap);
return -ENOENT; if (pos >= iomap->length)
ret = 0; ret = -ENOENT;
goto out; goto out;
}
BUG_ON(!(flags & IOMAP_WRITE));
} }
lblock = pos >> inode->i_blkbits; lblock = pos >> inode->i_blkbits;
@ -744,7 +746,7 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
iomap->type = IOMAP_HOLE; iomap->type = IOMAP_HOLE;
iomap->length = (u64)(lend - lblock) << inode->i_blkbits; iomap->length = (u64)(lend - lblock) << inode->i_blkbits;
iomap->flags = IOMAP_F_MERGED; iomap->flags = IOMAP_F_MERGED;
bmap_lock(ip, 0); bmap_lock(ip, flags & IOMAP_WRITE);
/* /*
* Directory data blocks have a struct gfs2_meta_header header, so the * Directory data blocks have a struct gfs2_meta_header header, so the
@ -787,27 +789,28 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,
iomap->flags |= IOMAP_F_BOUNDARY; iomap->flags |= IOMAP_F_BOUNDARY;
iomap->length = (u64)len << inode->i_blkbits; iomap->length = (u64)len << inode->i_blkbits;
ret = 0;
out_release: out_release:
release_metapath(&mp); release_metapath(&mp);
bmap_unlock(ip, 0); bmap_unlock(ip, flags & IOMAP_WRITE);
out: out:
trace_gfs2_iomap_end(ip, iomap, ret); trace_gfs2_iomap_end(ip, iomap, ret);
return ret; return ret;
do_alloc: do_alloc:
if (!(flags & IOMAP_WRITE)) { if (flags & IOMAP_WRITE) {
if (pos >= i_size_read(inode)) { ret = gfs2_iomap_alloc(inode, iomap, flags, &mp);
} else if (flags & IOMAP_REPORT) {
loff_t size = i_size_read(inode);
if (pos >= size)
ret = -ENOENT; ret = -ENOENT;
goto out_release; else if (height <= ip->i_height)
} iomap->length = hole_size(inode, lblock, &mp);
ret = 0; else
iomap->length = hole_size(inode, lblock, &mp); iomap->length = size - pos;
goto out_release; } else {
if (height <= ip->i_height)
iomap->length = hole_size(inode, lblock, &mp);
} }
ret = gfs2_iomap_alloc(inode, iomap, flags, &mp);
goto out_release; goto out_release;
} }