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/sysv/inode.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/sysv/inode.c')
| -rw-r--r-- | fs/sysv/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index 58b2d22142ba..d63c5e48b050 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c | |||
| @@ -201,7 +201,7 @@ static void sysv_read_inode(struct inode *inode) | |||
| 201 | inode->i_ctime.tv_nsec = 0; | 201 | inode->i_ctime.tv_nsec = 0; |
| 202 | inode->i_atime.tv_nsec = 0; | 202 | inode->i_atime.tv_nsec = 0; |
| 203 | inode->i_mtime.tv_nsec = 0; | 203 | inode->i_mtime.tv_nsec = 0; |
| 204 | inode->i_blocks = inode->i_blksize = 0; | 204 | inode->i_blocks = 0; |
| 205 | 205 | ||
| 206 | si = SYSV_I(inode); | 206 | si = SYSV_I(inode); |
| 207 | for (block = 0; block < 10+1+1+1; block++) | 207 | for (block = 0; block < 10+1+1+1; block++) |