diff options
Diffstat (limited to 'fs/logfs/readwrite.c')
-rw-r--r-- | fs/logfs/readwrite.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index f1cb512c5019..e1a3b6bf6324 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
@@ -119,8 +119,8 @@ static void logfs_disk_to_inode(struct logfs_disk_inode *di, struct inode*inode) | |||
119 | inode->i_mode = be16_to_cpu(di->di_mode); | 119 | inode->i_mode = be16_to_cpu(di->di_mode); |
120 | li->li_height = di->di_height; | 120 | li->li_height = di->di_height; |
121 | li->li_flags = be32_to_cpu(di->di_flags); | 121 | li->li_flags = be32_to_cpu(di->di_flags); |
122 | inode->i_uid = be32_to_cpu(di->di_uid); | 122 | i_uid_write(inode, be32_to_cpu(di->di_uid)); |
123 | inode->i_gid = be32_to_cpu(di->di_gid); | 123 | i_gid_write(inode, be32_to_cpu(di->di_gid)); |
124 | inode->i_size = be64_to_cpu(di->di_size); | 124 | inode->i_size = be64_to_cpu(di->di_size); |
125 | logfs_set_blocks(inode, be64_to_cpu(di->di_used_bytes)); | 125 | logfs_set_blocks(inode, be64_to_cpu(di->di_used_bytes)); |
126 | inode->i_atime = be64_to_timespec(di->di_atime); | 126 | inode->i_atime = be64_to_timespec(di->di_atime); |
@@ -156,8 +156,8 @@ static void logfs_inode_to_disk(struct inode *inode, struct logfs_disk_inode*di) | |||
156 | di->di_height = li->li_height; | 156 | di->di_height = li->li_height; |
157 | di->di_pad = 0; | 157 | di->di_pad = 0; |
158 | di->di_flags = cpu_to_be32(li->li_flags); | 158 | di->di_flags = cpu_to_be32(li->li_flags); |
159 | di->di_uid = cpu_to_be32(inode->i_uid); | 159 | di->di_uid = cpu_to_be32(i_uid_read(inode)); |
160 | di->di_gid = cpu_to_be32(inode->i_gid); | 160 | di->di_gid = cpu_to_be32(i_gid_read(inode)); |
161 | di->di_size = cpu_to_be64(i_size_read(inode)); | 161 | di->di_size = cpu_to_be64(i_size_read(inode)); |
162 | di->di_used_bytes = cpu_to_be64(li->li_used_bytes); | 162 | di->di_used_bytes = cpu_to_be64(li->li_used_bytes); |
163 | di->di_atime = timespec_to_be64(inode->i_atime); | 163 | di->di_atime = timespec_to_be64(inode->i_atime); |
@@ -2189,7 +2189,6 @@ void logfs_evict_inode(struct inode *inode) | |||
2189 | return; | 2189 | return; |
2190 | } | 2190 | } |
2191 | 2191 | ||
2192 | BUG_ON(inode->i_ino < LOGFS_RESERVED_INOS); | ||
2193 | page = inode_to_page(inode); | 2192 | page = inode_to_page(inode); |
2194 | BUG_ON(!page); /* FIXME: Use emergency page */ | 2193 | BUG_ON(!page); /* FIXME: Use emergency page */ |
2195 | logfs_put_write_page(page); | 2194 | logfs_put_write_page(page); |