summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTariq Saeed <tariq.x.saeed@oracle.com>2014-04-03 14:47:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 16:20:55 -0700
commit3ed2be719eb9770139da791342b190b20a7a9270 (patch)
tree1d8bfe464b454651400aef7158de91ff07cbab3a /fs
parenta35ad97cd48cfab45f4ee5eb0e6f5787a05cab25 (diff)
downloadop-kernel-dev-3ed2be719eb9770139da791342b190b20a7a9270.zip
op-kernel-dev-3ed2be719eb9770139da791342b190b20a7a9270.tar.gz
ocfs2: allow for more than one data extent when creating xattr
Orabug: 18108070 ocfs2_xattr_extend_allocation() hits panic when creating xattr during data extent alloc phase. The problem occurs if due to local alloc fragmentation, clusters are spread over multiple extents. In this case ocfs2_add_clusters_in_btree() finds no space to store more than one extent record and therefore fails returning RESTART_META. The situation is anticipated for xattr update case but not xattr create case. This fix simply ports that code to create case. Signed-off-by: Tariq Saeed <tariq.x.saeed@oracle.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/xattr.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 185fa3b7..4217fed 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -3200,8 +3200,15 @@ meta_guess:
clusters_add += 1;
}
} else {
- meta_add += 1;
credits += OCFS2_XATTR_BLOCK_CREATE_CREDITS;
+ if (xi->xi_value_len > OCFS2_XATTR_INLINE_SIZE) {
+ struct ocfs2_extent_list *el = &def_xv.xv.xr_list;
+ meta_add += ocfs2_extend_meta_needed(el);
+ credits += ocfs2_calc_extend_credits(inode->i_sb,
+ el);
+ } else {
+ meta_add += 1;
+ }
}
out:
if (clusters_need)
OpenPOWER on IntegriCloud