summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorZheng Liu <wenqing.lz@taobao.com>2012-02-20 17:53:05 -0500
committerTheodore Ts'o <tytso@mit.edu>2012-02-20 17:53:05 -0500
commitf1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee (patch)
tree00491f088a92bd95057d0befabfff7460edf0638 /fs/ext4
parent661aa520577046192e50467b28c9c5726a8a9fb1 (diff)
downloadblackbird-op-linux-f1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee.tar.gz
blackbird-op-linux-f1b3a2a75356ce9fdcbedd79d2bb0d1ca8ed9cee.zip
ext4: remove unneeded variable in ext4_xattr_check_block()
We could return directly from ext4_xattr_check_block(). Thus, we shouldn't need to define a 'error' variable. Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/xattr.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 93a00d89a220..1bff752d1b59 100644
--- a/fs/ext4/xattr.c
+++ b/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
OpenPOWER on IntegriCloud