Skip to contentSkip to conversation

btrfs/ioctl.c: quiet sparse warnings

PATCH In review H Hartley Sweeten 2 participants 3 messages Sep 23, 2011 Btrfs file system

lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 1/1 btrfs/ioctl.c: quiet sparse warnings

Quiet the following sparse warnings:

warning: cast removes address space of expression
warning: incorrect type in assignment (different address spaces)
expected struct btrfs_ioctl_space_info [noderef] <asn:1>*user_dest got struct btrfs_ioctl_space_info *<noident>
warning: symbol 'btrfs_ioctl_space_info' was not declared. Should it be static?

Signed-off-by H Hartley Sweeten <[email protected]>
Cc Chris Mason <[email protected]>

---

fs/btrfs/ioctl.c +2 -2
index 970977a..a001af4 100644
@@ -2599,7 +2599,7 @@ static void get_block_group_info(struct list_head *groups_list,
 	}
 }
 
-long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 {
 	struct btrfs_ioctl_space_args space_args;
 	struct btrfs_ioctl_space_info space;

@@ -2705,7 +2705,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 		up_read(&info->groups_sem);
 	}
 
-	user_dest = (struct btrfs_ioctl_space_info *)
+	user_dest = (struct btrfs_ioctl_space_info __user *)
 		(arg + sizeof(struct btrfs_ioctl_space_args));
 
 	if (copy_to_user(user_dest, dest_orig, alloc_size))
#1 lore raw
Quoted 1 line · H Hartley Sweeten

Quiet the following sparse warnings:

[]

fs/btrfs/ioctl.c

Quoted 1 line
fs/btrfs/ioctl.c +0 -0

[]

fs/btrfs/ioctl.c long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) · line 2709

Quoted 7 lines
fs/btrfs/ioctl.c +1 -1
@@ -2705,7 +2705,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 		up_read(&info->groups_sem);
 	}
 
-	user_dest = (struct btrfs_ioctl_space_info *)
+	user_dest = (struct btrfs_ioctl_space_info __user *)
                (arg + sizeof(struct btrfs_ioctl_space_args));

	user_dest = arg;
	user_dest++;

?

author
#2 lore raw

T24gRnJpZGF5LCBTZXB0ZW1iZXIgMjMsIDIwMTEgMTE6MTYgQU0sIEpvZSBQZXJjaGVzIHdyb3Rl Og0KPiBPbiBGcmksIDIwMTEtMDktMjMgYXQgMTE6MDcgLTA3MDAsIEggSGFydGxleSBTd2VldGVu IHdyb3RlOg0KPj4gUXVpZXQgdGhlIGZvbGxvd2luZyBzcGFyc2Ugd2FybmluZ3M6DQo+IFtdDQo+ PiBkaWZmIC0tZ2l0IGEvZnMvYnRyZnMvaW9jdGwuYyBiL2ZzL2J0cmZzL2lvY3RsLmMNCj4gW10N Cj4+IEBAIC0yNzA1LDcgKzI3MDUsNyBAQCBsb25nIGJ0cmZzX2lvY3RsX3NwYWNlX2luZm8oc3Ry dWN0IGJ0cmZzX3Jvb3QgKnJvb3QsIHZvaWQgX191c2VyICphcmcpDQo+PiAgCQl1cF9yZWFkKCZp bmZvLT5ncm91cHNfc2VtKTsNCj4+ICAJfQ0KPj4gIA0KPj4gLQl1c2VyX2Rlc3QgPSAoc3RydWN0 IGJ0cmZzX2lvY3RsX3NwYWNlX2luZm8gKikNCj4+ICsJdXNlcl9kZXN0ID0gKHN0cnVjdCBidHJm c19pb2N0bF9zcGFjZV9pbmZvIF9fdXNlciAqKQ0KPj4gICAgICAgICAgICAgICAgIChhcmcgKyBz aXplb2Yoc3RydWN0IGJ0cmZzX2lvY3RsX3NwYWNlX2FyZ3MpKTsNCj4NCj4JdXNlcl9kZXN0ID0g YXJnOw0KPgl1c2VyX2Rlc3QrKzsNCj4NCj4gPw0KDQpUaGF0IHByb2R1Y2VzIGEgbmV3IHNwYXJz ZSB3YXJuaW5nOg0KDQpmcy9idHJmcy9pb2N0bC5jOiBJbiBmdW5jdGlvbiDigJhidHJmc19pb2N0 bF9zcGFjZV9pbmZv4oCZOg0KZnMvYnRyZnMvaW9jdGwuYzoyNzA4OiB3YXJuaW5nOiDigJh1c2Vy X2Rlc3TigJkgbWF5IGJlIHVzZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1bmN0aW9uDQoNCkkg Z3Vlc3MgdXNlcl9kZXN0IGNvdWxkIGJlIHNldCBhdCB0aGUgc3RhcnQgb2YgdGhlIGZ1bmN0aW9u LiAgVGhpcyB3b3VsZA0KYWxzbyByZW1vdmUgdGhlIGNhc3Qgb2YgYXJnIGluIHRoZSBmaXJzdCBj b3B5X2Zyb21fdXNlci4NCg0KU29tZXRoaW5nIGxpa2UgdGhpczoNCg0KLS0tLS0tDQoNCmRpZmYg LS1naXQgYS9mcy9idHJmcy9pb2N0bC5jIGIvZnMvYnRyZnMvaW9jdGwuYw0KaW5kZXggOTcwOTc3 YS4uOWU3ZTVkYyAxMDA2NDQNCi0tLSBhL2ZzL2J0cmZzL2lvY3RsLmMNCisrKyBiL2ZzL2J0cmZz L2lvY3RsLmMNCkBAIC0yNTk5LDEzICsyNTk5LDEzIEBAIHN0YXRpYyB2b2lkIGdldF9ibG9ja19n cm91cF9pbmZvKHN0cnVjdCBsaXN0X2hlYWQgKmdyb3Vwc19saXN0LA0KICAgICAgICB9DQogfQ0K IA0KLWxvbmcgYnRyZnNfaW9jdGxfc3BhY2VfaW5mbyhzdHJ1Y3QgYnRyZnNfcm9vdCAqcm9vdCwg dm9pZCBfX3VzZXIgKmFyZykNCitzdGF0aWMgbG9uZyBidHJmc19pb2N0bF9zcGFjZV9pbmZvKHN0 cnVjdCBidHJmc19yb290ICpyb290LCB2b2lkIF9fdXNlciAqYXJnKQ0KIHsNCiAgICAgICAgc3Ry dWN0IGJ0cmZzX2lvY3RsX3NwYWNlX2FyZ3Mgc3BhY2VfYXJnczsNCiAgICAgICAgc3RydWN0IGJ0 cmZzX2lvY3RsX3NwYWNlX2luZm8gc3BhY2U7DQogICAgICAgIHN0cnVjdCBidHJmc19pb2N0bF9z cGFjZV9pbmZvICpkZXN0Ow0KICAgICAgICBzdHJ1Y3QgYnRyZnNfaW9jdGxfc3BhY2VfaW5mbyAq ZGVzdF9vcmlnOw0KLSAgICAgICBzdHJ1Y3QgYnRyZnNfaW9jdGxfc3BhY2VfaW5mbyBfX3VzZXIg KnVzZXJfZGVzdDsNCisgICAgICAgc3RydWN0IGJ0cmZzX2lvY3RsX3NwYWNlX2luZm8gX191c2Vy ICp1c2VyX2Rlc3QgPSBhcmc7DQogICAgICAgIHN0cnVjdCBidHJmc19zcGFjZV9pbmZvICppbmZv Ow0KICAgICAgICB1NjQgdHlwZXNbXSA9IHtCVFJGU19CTE9DS19HUk9VUF9EQVRBLA0KICAgICAg ICAgICAgICAgICAgICAgICBCVFJGU19CTE9DS19HUk9VUF9TWVNURU0sDQpAQCAtMjYxNyw5ICsy NjE3LDcgQEAgbG9uZyBidHJmc19pb2N0bF9zcGFjZV9pbmZvKHN0cnVjdCBidHJmc19yb290ICpy b290LCB2b2lkIF9fdXNlciAqYXJnKQ0KICAgICAgICB1NjQgc2xvdF9jb3VudCA9IDA7DQogICAg ICAgIGludCBpLCBjOw0KIA0KLSAgICAgICBpZiAoY29weV9mcm9tX3VzZXIoJnNwYWNlX2FyZ3Ms DQotICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RydWN0IGJ0cmZzX2lvY3RsX3NwYWNlX2Fy Z3MgX191c2VyICopYXJnLA0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKHNwYWNl X2FyZ3MpKSkNCisgICAgICAgaWYgKGNvcHlfZnJvbV91c2VyKCZzcGFjZV9hcmdzLCB1c2VyX2Rl c3QsIHNpemVvZihzcGFjZV9hcmdzKSkpDQogICAgICAgICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7 DQogDQogICAgICAgIGZvciAoaSA9IDA7IGkgPCBudW1fdHlwZXM7IGkrKykgew0KQEAgLTI3MDUs OCArMjcwMyw3IEBAIGxvbmcgYnRyZnNfaW9jdGxfc3BhY2VfaW5mbyhzdHJ1Y3QgYnRyZnNfcm9v dCAqcm9vdCwgdm9pZCBfX3VzZXIgKmFyZykNCiAgICAgICAgICAgICAgICB1cF9yZWFkKCZpbmZv LT5ncm91cHNfc2VtKTsNCiAgICAgICAgfQ0KIA0KLSAgICAgICB1c2VyX2Rlc3QgPSAoc3RydWN0 IGJ0cmZzX2lvY3RsX3NwYWNlX2luZm8gKikNCi0gICAgICAgICAgICAgICAoYXJnICsgc2l6ZW9m KHN0cnVjdCBidHJmc19pb2N0bF9zcGFjZV9hcmdzKSk7DQorICAgICAgIHVzZXJfZGVzdCsrOw0K IA0KICAgICAgICBpZiAoY29weV90b191c2VyKHVzZXJfZGVzdCwgZGVzdF9vcmlnLCBhbGxvY19z aXplKSkNCiAgICAgICAgICAgICAgICByZXQgPSAtRUZBVUxUOw0KDQo=