diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/hugetlbfs/inode.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
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 7d479ce3aceb..0ab0c6f5f438 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -506,7 +506,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid, | |||
| 506 | inode->i_mode = mode; | 506 | inode->i_mode = mode; |
| 507 | inode->i_uid = uid; | 507 | inode->i_uid = uid; |
| 508 | inode->i_gid = gid; | 508 | inode->i_gid = gid; |
| 509 | inode->i_blocks = 0; | ||
| 510 | inode->i_mapping->a_ops = &hugetlbfs_aops; | 509 | inode->i_mapping->a_ops = &hugetlbfs_aops; |
| 511 | inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info; | 510 | inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info; |
| 512 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 511 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |