void *first_val = s->base + min_offs;
size_t offs = le16_to_cpu(s->here->e_value_offs);
void *val = s->base + offs;
-@@ -606,13 +884,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
+@@ -606,13 +884,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
last = s->first;
while (!IS_LAST_ENTRY(last)) {
size_t o = le16_to_cpu(last->e_value_offs);
- if (!last->e_value_block &&
-- last->e_value_size && o < offs)
-+ if (last->e_value_size > 0 && o < offs)
++ if (!last->e_value_inum &&
+ last->e_value_size && o < offs)
last->e_value_offs =
cpu_to_le16(o + size);
last = EXT4_XATTR_NEXT(last);
void *first_val = s->base + min_offs;
size_t offs = le16_to_cpu(s->here->e_value_offs);
void *val = s->base + offs;
-@@ -685,13 +966,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
+@@ -685,13 +966,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
last = s->first;
while (!IS_LAST_ENTRY(last)) {
size_t o = le16_to_cpu(last->e_value_offs);
- if (!last->e_value_block &&
-- last->e_value_size && o < offs)
-+ if (last->e_value_size > 0 && o < offs)
++ if (!last->e_value_inum &&
+ last->e_value_size && o < offs)
last->e_value_offs =
cpu_to_le16(o + size);
last = EXT4_XATTR_NEXT(last);
void *first_val = s->base + min_offs;
size_t offs = le16_to_cpu(s->here->e_value_offs);
void *val = s->base + offs;
-@@ -607,13 +888,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
+@@ -607,13 +888,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
last = s->first;
while (!IS_LAST_ENTRY(last)) {
size_t o = le16_to_cpu(last->e_value_offs);
- if (!last->e_value_block &&
-- last->e_value_size && o < offs)
-+ if (last->e_value_size > 0 && o < offs)
++ if (!last->e_value_inum &&
+ last->e_value_size && o < offs)
last->e_value_offs =
cpu_to_le16(o + size);
last = EXT4_XATTR_NEXT(last);
void *first_val = s->base + min_offs;
size_t offs = le16_to_cpu(s->here->e_value_offs);
void *val = s->base + offs;
-@@ -680,13 +958,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
+@@ -680,13 +958,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
last = s->first;
while (!IS_LAST_ENTRY(last)) {
size_t o = le16_to_cpu(last->e_value_offs);
- if (!last->e_value_block &&
-- last->e_value_size && o < offs)
-+ if (last->e_value_size > 0 && o < offs)
++ if (!last->e_value_inum &&
+ last->e_value_size && o < offs)
last->e_value_offs =
cpu_to_le16(o + size);
last = EXT4_XATTR_NEXT(last);
local large_value="$(generate_string $(max_xattr_size))"
local small_value="bar"
- local name="trusted.big"
- log "save large xattr $name on $file"
- setfattr -n $name -v $large_value $file ||
- error "saving $name on $file failed"
-
- local new_value=$(get_xattr_value $name $file)
- [[ "$new_value" != "$large_value" ]] &&
- error "$name different after saving"
-
- log "shrink value of $name on $file"
- setfattr -n $name -v $small_value $file ||
- error "shrinking value of $name on $file failed"
-
- new_value=$(get_xattr_value $name $file)
- [[ "$new_value" != "$small_value" ]] &&
- error "$name different after shrinking"
-
- log "grow value of $name on $file"
- setfattr -n $name -v $large_value $file ||
- error "growing value of $name on $file failed"
-
- new_value=$(get_xattr_value $name $file)
- [[ "$new_value" != "$large_value" ]] &&
- error "$name different after growing"
-
- log "check value of $name on $file after remounting MDS"
- fail $SINGLEMDS
- new_value=$(get_xattr_value $name $file)
- [[ "$new_value" != "$large_value" ]] &&
- error "$name different after remounting MDS"
-
- log "remove large xattr $name from $file"
- setfattr -x $name $file || error "removing $name from $file failed"
-
- rm -f $file
- stopall
+ local name="trusted.big"
+ log "save large xattr $name on $file"
+ setfattr -n $name -v $large_value $file ||
+ error "saving $name on $file failed"
+
+ local new_value=$(get_xattr_value $name $file)
+ [[ "$new_value" != "$large_value" ]] &&
+ error "$name different after saving"
+
+ log "shrink value of $name on $file"
+ setfattr -n $name -v $small_value $file ||
+ error "shrinking value of $name on $file failed"
+
+ new_value=$(get_xattr_value $name $file)
+ [[ "$new_value" != "$small_value" ]] &&
+ error "$name different after shrinking"
+
+ log "grow value of $name on $file"
+ setfattr -n $name -v $large_value $file ||
+ error "growing value of $name on $file failed"
+
+ new_value=$(get_xattr_value $name $file)
+ [[ "$new_value" != "$large_value" ]] &&
+ error "$name different after growing"
+
+ log "check value of $name on $file after remounting MDS"
+ fail $SINGLEMDS
+ new_value=$(get_xattr_value $name $file)
+ [[ "$new_value" != "$large_value" ]] &&
+ error "$name different after remounting MDS"
+
+ log "remove large xattr $name from $file"
+ setfattr -x $name $file || error "removing $name from $file failed"
+
+ if $lxattr; then
+ stopall || error "stopping for e2fsck run"
+ for num in $(seq $MDSCOUNT); do
+ run_e2fsck $(facet_active_host mds$num) \
+ $(mdsdevname $num) "-y" ||
+ error "e2fsck MDT$num failed"
+ done
+ setup_noconfig || error "remounting the filesystem failed"
+ fi
+
+ # need to delete this file to avoid problems in other tests
+ rm -f $file
+ stopall || error "stopping systems to turn off large_xattr"
if $lxattr; then
for num in $(seq $MDSCOUNT); do
do_facet mds${num} $TUNE2FS -O ^large_xattr \