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/hostfs/hostfs_kern.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index b82e3d9c8790..322e876c35ed 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
| @@ -156,7 +156,6 @@ static int read_name(struct inode *ino, char *name) | |||
| 156 | ino->i_mode = i_mode; | 156 | ino->i_mode = i_mode; |
| 157 | ino->i_nlink = i_nlink; | 157 | ino->i_nlink = i_nlink; |
| 158 | ino->i_size = i_size; | 158 | ino->i_size = i_size; |
| 159 | ino->i_blksize = i_blksize; | ||
| 160 | ino->i_blocks = i_blocks; | 159 | ino->i_blocks = i_blocks; |
| 161 | return(0); | 160 | return(0); |
| 162 | } | 161 | } |