diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
| commit | 3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch) | |
| tree | 5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /arch/s390/hypfs/inode.c | |
| parent | 723cbe0775514853c22dc45005af59c360916af1 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into tracing/kmemtrace2
Diffstat (limited to 'arch/s390/hypfs/inode.c')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 9d4f8e6c0800..5a805df216bb 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
| @@ -106,7 +106,6 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
| 106 | ret->i_mode = mode; | 106 | ret->i_mode = mode; |
| 107 | ret->i_uid = hypfs_info->uid; | 107 | ret->i_uid = hypfs_info->uid; |
| 108 | ret->i_gid = hypfs_info->gid; | 108 | ret->i_gid = hypfs_info->gid; |
| 109 | ret->i_blocks = 0; | ||
| 110 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 111 | if (mode & S_IFDIR) | 110 | if (mode & S_IFDIR) |
| 112 | ret->i_nlink = 2; | 111 | ret->i_nlink = 2; |