.. | .. |
---|
29 | 29 | static struct kmem_cache *hfs_inode_cachep; |
---|
30 | 30 | |
---|
31 | 31 | MODULE_LICENSE("GPL"); |
---|
| 32 | +MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); |
---|
32 | 33 | |
---|
33 | 34 | static int hfs_sync_fs(struct super_block *sb, int wait) |
---|
34 | 35 | { |
---|
.. | .. |
---|
104 | 105 | buf->f_bavail = buf->f_bfree; |
---|
105 | 106 | buf->f_files = HFS_SB(sb)->fs_ablocks; |
---|
106 | 107 | buf->f_ffree = HFS_SB(sb)->free_ablocks; |
---|
107 | | - buf->f_fsid.val[0] = (u32)id; |
---|
108 | | - buf->f_fsid.val[1] = (u32)(id >> 32); |
---|
| 108 | + buf->f_fsid = u64_to_fsid(id); |
---|
109 | 109 | buf->f_namelen = HFS_NAMELEN; |
---|
110 | 110 | |
---|
111 | 111 | return 0; |
---|
.. | .. |
---|
167 | 167 | return i ? &i->vfs_inode : NULL; |
---|
168 | 168 | } |
---|
169 | 169 | |
---|
170 | | -static void hfs_i_callback(struct rcu_head *head) |
---|
| 170 | +static void hfs_free_inode(struct inode *inode) |
---|
171 | 171 | { |
---|
172 | | - struct inode *inode = container_of(head, struct inode, i_rcu); |
---|
173 | 172 | kmem_cache_free(hfs_inode_cachep, HFS_I(inode)); |
---|
174 | | -} |
---|
175 | | - |
---|
176 | | -static void hfs_destroy_inode(struct inode *inode) |
---|
177 | | -{ |
---|
178 | | - call_rcu(&inode->i_rcu, hfs_i_callback); |
---|
179 | 173 | } |
---|
180 | 174 | |
---|
181 | 175 | static const struct super_operations hfs_super_operations = { |
---|
182 | 176 | .alloc_inode = hfs_alloc_inode, |
---|
183 | | - .destroy_inode = hfs_destroy_inode, |
---|
| 177 | + .free_inode = hfs_free_inode, |
---|
184 | 178 | .write_inode = hfs_write_inode, |
---|
185 | 179 | .evict_inode = hfs_evict_inode, |
---|
186 | 180 | .put_super = hfs_put_super, |
---|