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/afs/inode.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/afs/inode.c')
| -rw-r--r-- | fs/afs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 4ebb30a50ed5..6f37754906c2 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c | |||
| @@ -72,7 +72,6 @@ static int afs_inode_map_status(struct afs_vnode *vnode) | |||
| 72 | inode->i_ctime.tv_sec = vnode->status.mtime_server; | 72 | inode->i_ctime.tv_sec = vnode->status.mtime_server; |
| 73 | inode->i_ctime.tv_nsec = 0; | 73 | inode->i_ctime.tv_nsec = 0; |
| 74 | inode->i_atime = inode->i_mtime = inode->i_ctime; | 74 | inode->i_atime = inode->i_mtime = inode->i_ctime; |
| 75 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
| 76 | inode->i_blocks = 0; | 75 | inode->i_blocks = 0; |
| 77 | inode->i_version = vnode->fid.unique; | 76 | inode->i_version = vnode->fid.unique; |
| 78 | inode->i_mapping->a_ops = &afs_fs_aops; | 77 | inode->i_mapping->a_ops = &afs_fs_aops; |