diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-07 12:01:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-07 12:01:45 -0800 |
| commit | ea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0 (patch) | |
| tree | 097441edab30bdcfaf65d2e7235e6c2a4c506495 | |
| parent | 69f39c570561bb49efcaaf58e0dd96d90f5fc571 (diff) | |
| parent | 3b5da96e4585a2788da6a07619bda3518d76eb30 (diff) | |
| download | linux-ea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0.tar.bz2 | |
Merge tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fix from Bob Peterson:
"An additional patch from Andreas Gruenbacher that fixes another
unfortunate GFS2 regression"
* tag 'gfs2-4.16.rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Fixes to "Implement iomap for block_map" (2)
| -rw-r--r-- | fs/gfs2/bmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 86d6a4435c87..51f940e76c5e 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -807,9 +807,6 @@ do_alloc: iomap->length = hole_size(inode, lblock, &mp); else iomap->length = size - pos; - } else { - if (height <= ip->i_height) - iomap->length = hole_size(inode, lblock, &mp); } goto out_release; } |