diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2007-10-16 18:38:25 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-10-17 18:50:03 -0400 |
commit | ac39849ddc19c0bbb39068497139ac45bccd4321 (patch) | |
tree | b5a6a17f1cd9c98374b91feafcf554bf5197c44d /fs | |
parent | d8dd0b45438d62fc4a93d8e3cee9985710d01e40 (diff) |
ext4: sparse fixes
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/fsync.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/xattr.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 2a167d7131fa..8d50879d1c2c 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c | |||
@@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync) | |||
47 | struct inode *inode = dentry->d_inode; | 47 | struct inode *inode = dentry->d_inode; |
48 | int ret = 0; | 48 | int ret = 0; |
49 | 49 | ||
50 | J_ASSERT(ext4_journal_current_handle() == 0); | 50 | J_ASSERT(ext4_journal_current_handle() == NULL); |
51 | 51 | ||
52 | /* | 52 | /* |
53 | * data=writeback: | 53 | * data=writeback: |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 89dd87634a2f..5489703d9573 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -1027,7 +1027,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode, | |||
1027 | } | 1027 | } |
1028 | if (buffer_new(&dummy)) { | 1028 | if (buffer_new(&dummy)) { |
1029 | J_ASSERT(create != 0); | 1029 | J_ASSERT(create != 0); |
1030 | J_ASSERT(handle != 0); | 1030 | J_ASSERT(handle != NULL); |
1031 | 1031 | ||
1032 | /* | 1032 | /* |
1033 | * Now that we do not always journal data, we should | 1033 | * Now that we do not always journal data, we should |
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 12c7d65fb0ca..86387302c2a9 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
@@ -1120,7 +1120,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, | |||
1120 | int total_ino, total_blk; | 1120 | int total_ino, total_blk; |
1121 | void *base, *start, *end; | 1121 | void *base, *start, *end; |
1122 | int extra_isize = 0, error = 0, tried_min_extra_isize = 0; | 1122 | int extra_isize = 0, error = 0, tried_min_extra_isize = 0; |
1123 | int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize; | 1123 | int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize); |
1124 | 1124 | ||
1125 | down_write(&EXT4_I(inode)->xattr_sem); | 1125 | down_write(&EXT4_I(inode)->xattr_sem); |
1126 | retry: | 1126 | retry: |
@@ -1292,7 +1292,7 @@ retry: | |||
1292 | 1292 | ||
1293 | i.name = b_entry_name; | 1293 | i.name = b_entry_name; |
1294 | i.value = buffer; | 1294 | i.value = buffer; |
1295 | i.value_len = cpu_to_le32(size); | 1295 | i.value_len = size; |
1296 | error = ext4_xattr_block_find(inode, &i, bs); | 1296 | error = ext4_xattr_block_find(inode, &i, bs); |
1297 | if (error) | 1297 | if (error) |
1298 | goto cleanup; | 1298 | goto cleanup; |