浏览代码

Fix minor type issues

Address some minor type issues identified by sparse checker.

Signed-off-by: Daniel J Blueman <daniel@quora.org>
Daniel J Blueman 13 年之前
父节点
当前提交
2eec6c8102
共有 3 个文件被更改,包括 5 次插入6 次删除
  1. 1 1
      fs/btrfs/ioctl.c
  2. 2 2
      fs/btrfs/ulist.c
  3. 2 3
      fs/btrfs/ulist.h

+ 1 - 1
fs/btrfs/ioctl.c

@@ -2916,7 +2916,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
 		up_read(&info->groups_sem);
 		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));
 		(arg + sizeof(struct btrfs_ioctl_space_args));
 
 
 	if (copy_to_user(user_dest, dest_orig, alloc_size))
 	if (copy_to_user(user_dest, dest_orig, alloc_size))

+ 2 - 2
fs/btrfs/ulist.c

@@ -95,7 +95,7 @@ EXPORT_SYMBOL(ulist_reinit);
  *
  *
  * The allocated ulist will be returned in an initialized state.
  * The allocated ulist will be returned in an initialized state.
  */
  */
-struct ulist *ulist_alloc(unsigned long gfp_mask)
+struct ulist *ulist_alloc(gfp_t gfp_mask)
 {
 {
 	struct ulist *ulist = kmalloc(sizeof(*ulist), gfp_mask);
 	struct ulist *ulist = kmalloc(sizeof(*ulist), gfp_mask);
 
 
@@ -144,7 +144,7 @@ EXPORT_SYMBOL(ulist_free);
  * unaltered.
  * unaltered.
  */
  */
 int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
 int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
-	      unsigned long gfp_mask)
+	      gfp_t gfp_mask)
 {
 {
 	int i;
 	int i;
 
 

+ 2 - 3
fs/btrfs/ulist.h

@@ -59,10 +59,9 @@ struct ulist {
 void ulist_init(struct ulist *ulist);
 void ulist_init(struct ulist *ulist);
 void ulist_fini(struct ulist *ulist);
 void ulist_fini(struct ulist *ulist);
 void ulist_reinit(struct ulist *ulist);
 void ulist_reinit(struct ulist *ulist);
-struct ulist *ulist_alloc(unsigned long gfp_mask);
+struct ulist *ulist_alloc(gfp_t gfp_mask);
 void ulist_free(struct ulist *ulist);
 void ulist_free(struct ulist *ulist);
-int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
-	      unsigned long gfp_mask);
+int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, gfp_t gfp_mask);
 struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_node *prev);
 struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_node *prev);
 
 
 #endif
 #endif