diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/xfs/linux-2.6/xfs_file.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_file.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 3d4f6dff2113..41cfcba7ce49 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
| @@ -370,7 +370,7 @@ xfs_file_readdir( | |||
| 370 | 370 | ||
| 371 | /* Try fairly hard to get memory */ | 371 | /* Try fairly hard to get memory */ |
| 372 | do { | 372 | do { |
| 373 | if ((read_buf = (caddr_t)kmalloc(rlen, GFP_KERNEL))) | 373 | if ((read_buf = kmalloc(rlen, GFP_KERNEL))) |
| 374 | break; | 374 | break; |
| 375 | rlen >>= 1; | 375 | rlen >>= 1; |
| 376 | } while (rlen >= 1024); | 376 | } while (rlen >= 1024); |