diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2011-02-21 21:01:42 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-02-21 21:01:42 -0500 |
commit | 7dc576158d7e5cdff3349f78598fdb4080536342 (patch) | |
tree | e7be15a8ee8add729915c81e9cb39cd55d6b572d /fs/ext4/inode.c | |
parent | da488945f4bf4096f4ab6091938469bd8822cfec (diff) |
ext4: Fix sparse warning: Using plain integer as NULL pointer
This patch fixes the warning "Using plain integer as NULL pointer",
generated by sparse, by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9f7f9e49914f..c6c6b7fcb455 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -720,7 +720,7 @@ allocated: | |||
720 | return ret; | 720 | return ret; |
721 | failed_out: | 721 | failed_out: |
722 | for (i = 0; i < index; i++) | 722 | for (i = 0; i < index; i++) |
723 | ext4_free_blocks(handle, inode, 0, new_blocks[i], 1, 0); | 723 | ext4_free_blocks(handle, inode, NULL, new_blocks[i], 1, 0); |
724 | return ret; | 724 | return ret; |
725 | } | 725 | } |
726 | 726 | ||
@@ -823,20 +823,20 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode, | |||
823 | return err; | 823 | return err; |
824 | failed: | 824 | failed: |
825 | /* Allocation failed, free what we already allocated */ | 825 | /* Allocation failed, free what we already allocated */ |
826 | ext4_free_blocks(handle, inode, 0, new_blocks[0], 1, 0); | 826 | ext4_free_blocks(handle, inode, NULL, new_blocks[0], 1, 0); |
827 | for (i = 1; i <= n ; i++) { | 827 | for (i = 1; i <= n ; i++) { |
828 | /* | 828 | /* |
829 | * branch[i].bh is newly allocated, so there is no | 829 | * branch[i].bh is newly allocated, so there is no |
830 | * need to revoke the block, which is why we don't | 830 | * need to revoke the block, which is why we don't |
831 | * need to set EXT4_FREE_BLOCKS_METADATA. | 831 | * need to set EXT4_FREE_BLOCKS_METADATA. |
832 | */ | 832 | */ |
833 | ext4_free_blocks(handle, inode, 0, new_blocks[i], 1, | 833 | ext4_free_blocks(handle, inode, NULL, new_blocks[i], 1, |
834 | EXT4_FREE_BLOCKS_FORGET); | 834 | EXT4_FREE_BLOCKS_FORGET); |
835 | } | 835 | } |
836 | for (i = n+1; i < indirect_blks; i++) | 836 | for (i = n+1; i < indirect_blks; i++) |
837 | ext4_free_blocks(handle, inode, 0, new_blocks[i], 1, 0); | 837 | ext4_free_blocks(handle, inode, NULL, new_blocks[i], 1, 0); |
838 | 838 | ||
839 | ext4_free_blocks(handle, inode, 0, new_blocks[i], num, 0); | 839 | ext4_free_blocks(handle, inode, NULL, new_blocks[i], num, 0); |
840 | 840 | ||
841 | return err; | 841 | return err; |
842 | } | 842 | } |
@@ -924,7 +924,7 @@ err_out: | |||
924 | ext4_free_blocks(handle, inode, where[i].bh, 0, 1, | 924 | ext4_free_blocks(handle, inode, where[i].bh, 0, 1, |
925 | EXT4_FREE_BLOCKS_FORGET); | 925 | EXT4_FREE_BLOCKS_FORGET); |
926 | } | 926 | } |
927 | ext4_free_blocks(handle, inode, 0, le32_to_cpu(where[num].key), | 927 | ext4_free_blocks(handle, inode, NULL, le32_to_cpu(where[num].key), |
928 | blks, 0); | 928 | blks, 0); |
929 | 929 | ||
930 | return err; | 930 | return err; |
@@ -4228,7 +4228,7 @@ static int ext4_clear_blocks(handle_t *handle, struct inode *inode, | |||
4228 | for (p = first; p < last; p++) | 4228 | for (p = first; p < last; p++) |
4229 | *p = 0; | 4229 | *p = 0; |
4230 | 4230 | ||
4231 | ext4_free_blocks(handle, inode, 0, block_to_free, count, flags); | 4231 | ext4_free_blocks(handle, inode, NULL, block_to_free, count, flags); |
4232 | return 0; | 4232 | return 0; |
4233 | } | 4233 | } |
4234 | 4234 | ||
@@ -4416,7 +4416,7 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode, | |||
4416 | * transaction where the data blocks are | 4416 | * transaction where the data blocks are |
4417 | * actually freed. | 4417 | * actually freed. |
4418 | */ | 4418 | */ |
4419 | ext4_free_blocks(handle, inode, 0, nr, 1, | 4419 | ext4_free_blocks(handle, inode, NULL, nr, 1, |
4420 | EXT4_FREE_BLOCKS_METADATA| | 4420 | EXT4_FREE_BLOCKS_METADATA| |
4421 | EXT4_FREE_BLOCKS_FORGET); | 4421 | EXT4_FREE_BLOCKS_FORGET); |
4422 | 4422 | ||
@@ -4875,7 +4875,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) | |||
4875 | return inode; | 4875 | return inode; |
4876 | 4876 | ||
4877 | ei = EXT4_I(inode); | 4877 | ei = EXT4_I(inode); |
4878 | iloc.bh = 0; | 4878 | iloc.bh = NULL; |
4879 | 4879 | ||
4880 | ret = __ext4_get_inode_loc(inode, &iloc, 0); | 4880 | ret = __ext4_get_inode_loc(inode, &iloc, 0); |
4881 | if (ret < 0) | 4881 | if (ret < 0) |