From 92b2bbf67a561cd8cfe63d40c875efef7d921762 Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Sun, 9 May 2010 15:31:22 +0900 Subject: [PATCH] --- yaml --- r: 196028 b: refs/heads/master c: cdce214e39814fd46d47e0e660ca3ddf3fdce8a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b19cb1d1fcce..b610f80fd990 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b87ca91948843472c05ae49e4c5e1714001d24c9 +refs/heads/master: cdce214e39814fd46d47e0e660ca3ddf3fdce8a6 diff --git a/trunk/fs/nilfs2/inode.c b/trunk/fs/nilfs2/inode.c index 0957b58f909d..5e226d4b41d3 100644 --- a/trunk/fs/nilfs2/inode.c +++ b/trunk/fs/nilfs2/inode.c @@ -451,7 +451,7 @@ static int __nilfs_read_inode(struct super_block *sb, unsigned long ino, inode->i_op = &nilfs_special_inode_operations; init_special_inode( inode, inode->i_mode, - new_decode_dev(le64_to_cpu(raw_inode->i_device_code))); + huge_decode_dev(le64_to_cpu(raw_inode->i_device_code))); } nilfs_ifile_unmap_inode(sbi->s_ifile, ino, bh); brelse(bh); @@ -511,7 +511,7 @@ void nilfs_write_inode_common(struct inode *inode, nilfs_bmap_write(ii->i_bmap, raw_inode); else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) raw_inode->i_device_code = - cpu_to_le64(new_encode_dev(inode->i_rdev)); + cpu_to_le64(huge_encode_dev(inode->i_rdev)); /* When extending inode, nilfs->ns_inode_size should be checked for substitutions of appended fields */ }