diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /fs/hugetlbfs/inode.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index c3920c96dadf..e025a31b4c64 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -357,7 +357,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid, | |||
| 357 | inode->i_mode = mode; | 357 | inode->i_mode = mode; |
| 358 | inode->i_uid = uid; | 358 | inode->i_uid = uid; |
| 359 | inode->i_gid = gid; | 359 | inode->i_gid = gid; |
| 360 | inode->i_blksize = HPAGE_SIZE; | ||
| 361 | inode->i_blocks = 0; | 360 | inode->i_blocks = 0; |
| 362 | inode->i_mapping->a_ops = &hugetlbfs_aops; | 361 | inode->i_mapping->a_ops = &hugetlbfs_aops; |
| 363 | inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info; | 362 | inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info; |