diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/block/rd.c | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/block/rd.c')
| -rw-r--r-- | drivers/block/rd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 145c1fbffe01..68c60a5bcdab 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
| @@ -348,7 +348,7 @@ static int rd_open(struct inode *inode, struct file *filp) | |||
| 348 | struct block_device *bdev = inode->i_bdev; | 348 | struct block_device *bdev = inode->i_bdev; |
| 349 | struct address_space *mapping; | 349 | struct address_space *mapping; |
| 350 | unsigned bsize; | 350 | unsigned bsize; |
| 351 | int gfp_mask; | 351 | gfp_t gfp_mask; |
| 352 | 352 | ||
| 353 | inode = igrab(bdev->bd_inode); | 353 | inode = igrab(bdev->bd_inode); |
| 354 | rd_bdev[unit] = bdev; | 354 | rd_bdev[unit] = bdev; |