summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-01-06 13:23:26 +0200
committerAvi Kivity <avi@redhat.com>2009-01-06 13:23:26 +0200
commit71d7006a54604e6fc5d19ed80b999ff5930fbf9f (patch)
tree3cb70461c75537bfd465de253c54c78550630b2f /arch/s390
parent836985fb96fa80185470d521474766eac7c361c5 (diff)
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/hypfs/inode.c1
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)
ret->i_mode = mode;
ret->i_uid = hypfs_info->uid;
ret->i_gid = hypfs_info->gid;
- ret->i_blocks = 0;
ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
if (mode & S_IFDIR)
ret->i_nlink = 2;