Skip to contentSkip to conversation

staging: lustre: Correct two minor issues found by sparse

PATCH New M. Vefa Bicakci 1 participant 3 messages Feb 28, 2016 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: lustre: Correct two minor issues found by sparse

The patches in this series correct two minor issues found by sparse in staging/lustre.

These patches were tested with compilation only; given their nature, I hope/believe this is sufficient. The patches apply cleanly onto commit 2cda64cf6998 ("staging: unisys: visorbus: Remove useless return variables") which points to the tip of the staging-next and staging-testing branches as of now.

M. Vefa Bicakci (2):
staging: lustre: Use const static file_operations struct
staging: lustre: Use __user for a pointer to a user space address

 drivers/staging/lustre/lustre/libcfs/module.c           | 2 +-
 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/2 staging: lustre: Use const static file_operations struct

This commit corrects the following sparse warning regarding a file_operations structure being non-static and constifies the structure in question as well.

warning: symbol 'lprocfs_stats_seq_fops' was not declared.
Should it be static?

---
 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +1 -1
index 28bb4e53adaa..1c39e90979df 100644
@@ -1196,7 +1196,7 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file)
 	return 0;
 }
 
-struct file_operations lprocfs_stats_seq_fops = {
+static const struct file_operations lprocfs_stats_seq_fops = {
 	.owner   = THIS_MODULE,
 	.open    = lprocfs_stats_seq_open,
 	.read    = seq_read,
Signature · 1 line
2.5.0
#2 lore raw

PATCH 2/2 staging: lustre: Use __user for a pointer to a user space address

In reply to M. Vefa Bicakci

This commit corrects two sparse warnings caused by the lack of a __user annotation for the third argument of the libcfs_ioctl_handle function.

module.c:165:68: warning: incorrect type in argument 1
(different address spaces)
module.c:165:68: expected void [noderef] <asn:1>*arg
module.c:165:68: got void *arg
module.c:209:47: warning: incorrect type in argument 3
(different address spaces)
module.c:209:47: expected void *arg
module.c:209:47: got void [noderef] <asn:1>*arg

The need to have the __user annotation is supported by the fact that libcfs_ioctl_handle passes its third argument to a helper function (libcfs_ioctl_popdata) which also has a __user annotation for its corresponding argument.

---
 drivers/staging/lustre/lustre/libcfs/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/libcfs/module.c +1 -1
index 05e2c5625220..f3845dcee259 100644
@@ -120,7 +120,7 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
 EXPORT_SYMBOL(libcfs_deregister_ioctl);
 
 static int libcfs_ioctl_handle(struct cfs_psdev_file *pfile, unsigned long cmd,
-			       void *arg, struct libcfs_ioctl_hdr *hdr)
+			       void __user *arg, struct libcfs_ioctl_hdr *hdr)
 {
 	struct libcfs_ioctl_data *data = NULL;
 	int err = -EINVAL;
Signature · 1 line
2.5.0