diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:03:30 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:05:48 (GMT) |
| commit | b3f288de7c8add67a3364e989b865b6537838662 (patch) | |
| tree | 389c80ae471e4e24f25e6c38862a89ee5d833d86 /fs/ocfs2/extent_map.c | |
| parent | 04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (diff) | |
| parent | 8d962507007357d6fbbcbdd1647faa389a9aed6d (diff) | |
| download | linux-fsl-qoriq-b3f288de7c8add67a3364e989b865b6537838662.tar.xz | |
Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable
These changes bring both HugeTLB support and Transparent HugePage
(THP) support to ARM. Only long descriptors (LPAE) are supported
in this series.
The code has been tested on an Arndale board (Exynos 5250).
Diffstat (limited to 'fs/ocfs2/extent_map.c')
| -rw-r--r-- | fs/ocfs2/extent_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 1c39efb..2487116 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -790,7 +790,7 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, &hole_size, &rec, &is_last); if (ret) { mlog_errno(ret); - goto out; + goto out_unlock; } if (rec.e_blkno == 0ULL) { |