Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8272
b: refs/heads/master
c: 87162a2
h: refs/heads/master
v: v3
  • Loading branch information
viro@ZenIV.linux.org.uk authored and Linus Torvalds committed Sep 9, 2005
1 parent dedcde2 commit a4fec74
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01703597ead8194b46932ba2bcda897e872e91e0
refs/heads/master: 87162a28acceda05dadf10a8333183f6d2b55265
4 changes: 2 additions & 2 deletions trunk/drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,7 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
return 0;
}

static int get_bitmap_file(mddev_t * mddev, void * arg)
static int get_bitmap_file(mddev_t * mddev, void __user * arg)
{
mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */
char *ptr, *buf = NULL;
Expand Down Expand Up @@ -2781,7 +2781,7 @@ static int md_ioctl(struct inode *inode, struct file *file,
goto done_unlock;

case GET_BITMAP_FILE:
err = get_bitmap_file(mddev, (void *)arg);
err = get_bitmap_file(mddev, argp);
goto done_unlock;

case GET_DISK_INFO:
Expand Down

0 comments on commit a4fec74

Please sign in to comment.