diff options
Diffstat (limited to 'fs/btrfs/tests/inode-tests.c')
| -rw-r--r-- | fs/btrfs/tests/inode-tests.c | 46 | 
1 files changed, 24 insertions, 22 deletions
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c index 4d0f038e14f1..8c91d03cc82d 100644 --- a/fs/btrfs/tests/inode-tests.c +++ b/fs/btrfs/tests/inode-tests.c @@ -278,7 +278,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	/* First with no extents */  	BTRFS_I(inode)->root = root; -	em = btrfs_get_extent(inode, NULL, 0, 0, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize, 0);  	if (IS_ERR(em)) {  		em = NULL;  		test_msg("Got an error when we shouldn't have\n"); @@ -293,7 +293,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  		goto out;  	}  	free_extent_map(em); -	btrfs_drop_extent_cache(inode, 0, (u64)-1, 0); +	btrfs_drop_extent_cache(BTRFS_I(inode), 0, (u64)-1, 0);  	/*  	 * All of the magic numbers are based on the mapping setup in @@ -302,7 +302,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	 */  	setup_file_extents(root, sectorsize); -	em = btrfs_get_extent(inode, NULL, 0, 0, (u64)-1, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -323,7 +323,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -350,7 +350,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -372,7 +372,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* Regular extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -399,7 +399,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* The next 3 are split extents */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -428,7 +428,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -450,7 +450,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -484,7 +484,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* Prealloc extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -513,7 +513,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* The next 3 are a half written prealloc extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -543,7 +543,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -576,7 +576,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -611,7 +611,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* Now for the compressed extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -645,7 +645,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* Split compressed extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -680,7 +680,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -707,7 +707,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -742,7 +742,8 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	free_extent_map(em);  	/* A hole between regular extents but no hole extent */ -	em = btrfs_get_extent(inode, NULL, 0, offset + 6, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6, +			sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -769,7 +770,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, 4096 * 1024, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, 4096 * 1024, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -802,7 +803,7 @@ static noinline int test_btrfs_get_extent(u32 sectorsize, u32 nodesize)  	offset = em->start + em->len;  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, offset, sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -885,7 +886,7 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)  	insert_inode_item_key(root);  	insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize,  		      sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1); -	em = btrfs_get_extent(inode, NULL, 0, 0, 2 * sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out; @@ -907,7 +908,8 @@ static int test_hole_first(u32 sectorsize, u32 nodesize)  	}  	free_extent_map(em); -	em = btrfs_get_extent(inode, NULL, 0, sectorsize, 2 * sectorsize, 0); +	em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize, +			2 * sectorsize, 0);  	if (IS_ERR(em)) {  		test_msg("Got an error when we shouldn't have\n");  		goto out;  | 
