From: Aneesh Kumar K.V <[email protected]> Signed-off-by: Aneesh Kumar K.V <[email protected]> --- fs/ext4/fsync.c | 2 +- fs/ext4/inode.c | 2 +- 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 2a167d7..8d50879 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) struct inode *inode = dentry->d_inode; int ret = 0; - J_ASSERT(ext4_journal_current_handle() == 0); + J_ASSERT(ext4_journal_current_handle() == NULL); /* * data=writeback: diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a2e1ea4..07afd4a 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, } if (buffer_new(&dummy)) { J_ASSERT(create != 0); - J_ASSERT(handle != 0); + J_ASSERT(handle != NULL); /* * Now that we do not always journal data, we should diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 12c7d65..8638730 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, int total_ino, total_blk; void *base, *start, *end; int extra_isize = 0, error = 0, tried_min_extra_isize = 0; - int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize; + int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize); down_write(&EXT4_I(inode)->xattr_sem); retry: @@ -1292,7 +1292,7 @@ retry: i.name = b_entry_name; i.value = buffer; - i.value_len = cpu_to_le32(size); + i.value_len = size; error = ext4_xattr_block_find(inode, &i, bs); if (error) goto cleanup; -- 1.5.3.2.81.g17ed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- References:
- [PATCH, RFC] Ext4 patches planned for submission upstream
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] jbd/jbd2: JBD memory allocation cleanups
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] jbd2: fix commit code to properly abort journal
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] JBD2: debug code cleanup.
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] Once ext4 will not implement fragment, it is believed it will never be
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: remove #ifdef CONFIG_EXT4_INDEX
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] Ext4: Uninitialized Block Groups
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Fix sparse warnings
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] This feature relaxes check restrictions on where each block groups meta
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext4
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Avoid rec_len overflow with 64KB block size
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext2
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext3
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext2: Avoid rec_len overflow with 64KB block size
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext3: Avoid rec_len overflow with 64KB block size
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert bg_block_bitmap to bg_block_bitmap_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert bg_inode_bitmap and bg_inode_table
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert s_blocks_count to s_blocks_count_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert s_r_blocks_count and s_free_blocks_count
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert ext4_extent.ee_start to ext4_extent.ee_start_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert ext4_extent_idx.ei_leaf to ext4_extent_idx.ei_leaf_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH, RFC] Ext4 patches planned for submission upstream
- Prev by Date: [PATCH] JBD2: debug code cleanup.
- Next by Date: [PATCH] ext4: Avoid rec_len overflow with 64KB block size
- Previous by thread: [PATCH] ext4: Convert ext4_extent_idx.ei_leaf to ext4_extent_idx.ei_leaf_lo
- Next by thread: Re: [PATCH] jbd/jbd2: JBD memory allocation cleanups
- Index(es):