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/inode.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ext2/inode.c')
| -rw-r--r-- | fs/ext2/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index fb4d3220eb8d..dd4e14c221e0 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -1094,7 +1094,6 @@ void ext2_read_inode (struct inode * inode) | |||
| 1094 | brelse (bh); | 1094 | brelse (bh); |
| 1095 | goto bad_inode; | 1095 | goto bad_inode; |
| 1096 | } | 1096 | } |
| 1097 | inode->i_blksize = PAGE_SIZE; /* This is the optimal IO size (for stat), not the fs block size */ | ||
| 1098 | inode->i_blocks = le32_to_cpu(raw_inode->i_blocks); | 1097 | inode->i_blocks = le32_to_cpu(raw_inode->i_blocks); |
| 1099 | ei->i_flags = le32_to_cpu(raw_inode->i_flags); | 1098 | ei->i_flags = le32_to_cpu(raw_inode->i_flags); |
| 1100 | ei->i_faddr = le32_to_cpu(raw_inode->i_faddr); | 1099 | ei->i_faddr = le32_to_cpu(raw_inode->i_faddr); |