Commit 4c6243ec authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: Properly mark ll_obd_statfs argument as __user 



Also update all callers.
This fixes a bunch of address space mismatch warnings from sparse.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0dd48a43

drivers/staging/lustre/lustre/llite/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case LL_IOC_LOV_SWAP_LAYOUTS:

		return -EPERM;

	case LL_IOC_OBD_STATFS:

		return ll_obd_statfs(inode, (void *)arg);

		return ll_obd_statfs(inode, (void __user *)arg);

	case LL_IOC_LOV_GETSTRIPE:

	case LL_IOC_MDC_GETINFO:

	case IOC_MDC_GETFILEINFO:

drivers/staging/lustre/lustre/llite/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2278,7 +2278,7 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case LL_IOC_GROUP_UNLOCK:

		return ll_put_grouplock(inode, file, arg);

	case IOC_OBD_STATFS:

		return ll_obd_statfs(inode, (void *)arg);

		return ll_obd_statfs(inode, (void __user *)arg);



	/* We need to special case any other ioctls we want to handle,

	 * to send them to the MDS/OST as appropriate and to properly

drivers/staging/lustre/lustre/llite/llite_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ int ll_show_options(struct seq_file *seq, struct dentry *dentry); 
void ll_dirty_page_discard_warn(struct page *page, int ioret);

int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,

		  struct super_block *, struct lookup_intent *);

int ll_obd_statfs(struct inode *inode, void *arg);

int ll_obd_statfs(struct inode *inode, void __user *arg);

int ll_get_max_mdsize(struct ll_sb_info *sbi, int *max_mdsize);

int ll_get_default_mdsize(struct ll_sb_info *sbi, int *default_mdsize);

int ll_process_config(struct lustre_cfg *lcfg);

drivers/staging/lustre/lustre/llite/llite_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req, 
	return rc;

}



int ll_obd_statfs(struct inode *inode, void *arg)

int ll_obd_statfs(struct inode *inode, void __user *arg)

{

	struct ll_sb_info *sbi = NULL;

	struct obd_export *exp;