.. | .. |
---|
98 | 98 | buf->f_files = sbi->s_ninodes; |
---|
99 | 99 | buf->f_ffree = sysv_count_free_inodes(sb); |
---|
100 | 100 | buf->f_namelen = SYSV_NAMELEN; |
---|
101 | | - buf->f_fsid.val[0] = (u32)id; |
---|
102 | | - buf->f_fsid.val[1] = (u32)(id >> 32); |
---|
| 101 | + buf->f_fsid = u64_to_fsid(id); |
---|
103 | 102 | return 0; |
---|
104 | 103 | } |
---|
105 | 104 | |
---|
.. | .. |
---|
313 | 312 | return &si->vfs_inode; |
---|
314 | 313 | } |
---|
315 | 314 | |
---|
316 | | -static void sysv_i_callback(struct rcu_head *head) |
---|
| 315 | +static void sysv_free_in_core_inode(struct inode *inode) |
---|
317 | 316 | { |
---|
318 | | - struct inode *inode = container_of(head, struct inode, i_rcu); |
---|
319 | 317 | kmem_cache_free(sysv_inode_cachep, SYSV_I(inode)); |
---|
320 | | -} |
---|
321 | | - |
---|
322 | | -static void sysv_destroy_inode(struct inode *inode) |
---|
323 | | -{ |
---|
324 | | - call_rcu(&inode->i_rcu, sysv_i_callback); |
---|
325 | 318 | } |
---|
326 | 319 | |
---|
327 | 320 | static void init_once(void *p) |
---|
.. | .. |
---|
333 | 326 | |
---|
334 | 327 | const struct super_operations sysv_sops = { |
---|
335 | 328 | .alloc_inode = sysv_alloc_inode, |
---|
336 | | - .destroy_inode = sysv_destroy_inode, |
---|
| 329 | + .free_inode = sysv_free_in_core_inode, |
---|
337 | 330 | .write_inode = sysv_write_inode, |
---|
338 | 331 | .evict_inode = sysv_evict_inode, |
---|
339 | 332 | .put_super = sysv_put_super, |
---|