]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ext4: sparse fixes
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Tue, 16 Oct 2007 22:38:25 +0000 (18:38 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 17 Oct 2007 22:50:03 +0000 (18:50 -0400)
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
fs/ext4/fsync.c
fs/ext4/inode.c
fs/ext4/xattr.c

index 2a167d7131fa38feec17d647bbbdefbb98b6b601..8d50879d1c2c68f23284314ff4fc7c5afe3c0a8e 100644 (file)
@@ -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:
index 89dd87634a2fc45b6a105e855ceae4ba2b3023f2..5489703d95738ffb075ed7cb275aab94eb4d74e6 100644 (file)
@@ -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
index 12c7d65fb0ca1314d11970944dd11ce8c940a4b3..86387302c2a9b45591e71c8e6900fdde92c09eaf 100644 (file)
@@ -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;