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/ext2/ialloc.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 695f69ccf908..2cb545bf0f3c 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -574,7 +574,6 @@ got: | |||
| 574 | inode->i_mode = mode; | 574 | inode->i_mode = mode; |
| 575 | 575 | ||
| 576 | inode->i_ino = ino; | 576 | inode->i_ino = ino; |
| 577 | inode->i_blksize = PAGE_SIZE; /* This is the optimal IO size (for stat), not the fs block size */ | ||
| 578 | inode->i_blocks = 0; | 577 | inode->i_blocks = 0; |
| 579 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; | 578 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; |
| 580 | memset(ei->i_data, 0, sizeof(ei->i_data)); | 579 | memset(ei->i_data, 0, sizeof(ei->i_data)); |