diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/jfs/jfs_inode.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/jfs/jfs_inode.c')
| -rw-r--r-- | fs/jfs/jfs_inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c index 495df402916d..bffaca9ae3a2 100644 --- a/fs/jfs/jfs_inode.c +++ b/fs/jfs/jfs_inode.c | |||
| @@ -115,7 +115,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode) | |||
| 115 | } | 115 | } |
| 116 | jfs_inode->mode2 |= mode; | 116 | jfs_inode->mode2 |= mode; |
| 117 | 117 | ||
| 118 | inode->i_blksize = sb->s_blocksize; | ||
| 119 | inode->i_blocks = 0; | 118 | inode->i_blocks = 0; |
| 120 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; | 119 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; |
| 121 | jfs_inode->otime = inode->i_ctime.tv_sec; | 120 | jfs_inode->otime = inode->i_ctime.tv_sec; |