---

yaml --- r: 296544 b: refs/heads/master c: f1b3a2a h: refs/heads/master v: v3
git-mirror · Feb 20, 2012 · 010f96e · 010f96e
1 parent 8c8a966
commit 010f96e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 661aa520577046192e50467b28c9c5726a8a9fb1
+refs/heads/master: f1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
@@ -158,13 +158,10 @@ ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end)
 static inline int
 ext4_xattr_check_block(struct buffer_head *bh)
 {
-	int error;
-
 	if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) ||
 	    BHDR(bh)->h_blocks != cpu_to_le32(1))
 		return -EIO;
-	error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size);
-	return error;
+	return ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size);
 }
 
 static inline int