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/hpfs/inode.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/hpfs/inode.c')
| -rw-r--r-- | fs/hpfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 56f2c338c4d9..bcf6ee36e065 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c | |||
| @@ -17,7 +17,6 @@ void hpfs_init_inode(struct inode *i) | |||
| 17 | i->i_gid = hpfs_sb(sb)->sb_gid; | 17 | i->i_gid = hpfs_sb(sb)->sb_gid; |
| 18 | i->i_mode = hpfs_sb(sb)->sb_mode; | 18 | i->i_mode = hpfs_sb(sb)->sb_mode; |
| 19 | hpfs_inode->i_conv = hpfs_sb(sb)->sb_conv; | 19 | hpfs_inode->i_conv = hpfs_sb(sb)->sb_conv; |
| 20 | i->i_blksize = 512; | ||
| 21 | i->i_size = -1; | 20 | i->i_size = -1; |
| 22 | i->i_blocks = -1; | 21 | i->i_blocks = -1; |
| 23 | 22 | ||