diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /arch/s390/hypfs/inode.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/s390/hypfs/inode.c')
| -rw-r--r-- | arch/s390/hypfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 36313801cd5c..8aadcd7a7cf8 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
| @@ -280,8 +280,8 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 280 | if (!sbi) | 280 | if (!sbi) |
| 281 | return -ENOMEM; | 281 | return -ENOMEM; |
| 282 | mutex_init(&sbi->lock); | 282 | mutex_init(&sbi->lock); |
| 283 | sbi->uid = current->uid; | 283 | sbi->uid = current_uid(); |
| 284 | sbi->gid = current->gid; | 284 | sbi->gid = current_gid(); |
| 285 | sb->s_fs_info = sbi; | 285 | sb->s_fs_info = sbi; |
| 286 | sb->s_blocksize = PAGE_CACHE_SIZE; | 286 | sb->s_blocksize = PAGE_CACHE_SIZE; |
| 287 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; | 287 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; |