From 010f96ee7fcccecad6cbb02bedde50351132f7da Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Mon, 20 Feb 2012 17:53:05 -0500 Subject: [PATCH] --- yaml --- r: 296544 b: refs/heads/master c: f1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/xattr.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9f2ce360eef8..6a488ce1945d 100644 --- 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 index 93a00d89a220..1bff752d1b59 100644 --- 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