diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/block/rd.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
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; |