diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 20:08:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 20:08:38 +1000 |
| commit | d653b0b3717843efa3e72bdcaf37b2a0b598eea0 (patch) | |
| tree | c95b2471229d71fb0ced2f37723b7223e9987474 /fs/ocfs2/refcounttree.c | |
| parent | 3f607a5176e202974afb3dbb31d0f37cb2f4551f (diff) | |
| parent | 76e1488440013a0d737fbb9d1f8efe226138f7f0 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
mm/shmem.c
Diffstat (limited to 'fs/ocfs2/refcounttree.c')
| -rw-r--r-- | fs/ocfs2/refcounttree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 636aab69ead5..d81f6e2a97f5 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -3109,7 +3109,7 @@ static int ocfs2_clear_ext_refcount(handle_t *handle, el = path_leaf_el(path); index = ocfs2_search_extent_list(el, cpos); - if (index == -1 || index >= le16_to_cpu(el->l_next_free_rec)) { + if (index == -1) { ocfs2_error(sb, "Inode %llu has an extent at cpos %u which can no " "longer be found.\n", |