Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2b757fe authored by Al Viro's avatar Al Viro
Browse files

ntfs: switch to ->free_inode() 



move the synchronous stuff from ->destroy_inode() to ->evict_inode(),
turn the RCU-delayed part into ->free_inode()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f614ee1e

fs/ntfs/inode.c

+4 −13
Original line number Diff line number Diff line
@@ -332,23 +332,11 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb) 
	return NULL;

}



static void ntfs_i_callback(struct rcu_head *head)

void ntfs_free_big_inode(struct inode *inode)

{

	struct inode *inode = container_of(head, struct inode, i_rcu);

	kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode));

}



void ntfs_destroy_big_inode(struct inode *inode)

{

	ntfs_inode *ni = NTFS_I(inode);



	ntfs_debug("Entering.");

	BUG_ON(ni->page);

	if (!atomic_dec_and_test(&ni->count))

		BUG();

	call_rcu(&inode->i_rcu, ntfs_i_callback);

}



static inline ntfs_inode *ntfs_alloc_extent_inode(void)

{

	ntfs_inode *ni;
@@ -2287,6 +2275,9 @@ void ntfs_evict_big_inode(struct inode *vi) 
			ni->ext.base_ntfs_ino = NULL;

		}

	}

	BUG_ON(ni->page);

	if (!atomic_dec_and_test(&ni->count))

		BUG();

	return;

}

fs/ntfs/inode.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ extern struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name, 
		u32 name_len);



extern struct inode *ntfs_alloc_big_inode(struct super_block *sb);

extern void ntfs_destroy_big_inode(struct inode *inode);

extern void ntfs_free_big_inode(struct inode *inode);

extern void ntfs_evict_big_inode(struct inode *vi);



extern void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni);

fs/ntfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2676,7 +2676,7 @@ static int ntfs_write_inode(struct inode *vi, struct writeback_control *wbc) 
 */

static const struct super_operations ntfs_sops = {

	.alloc_inode	= ntfs_alloc_big_inode,	  /* VFS: Allocate new inode. */

	.destroy_inode	= ntfs_destroy_big_inode, /* VFS: Deallocate inode. */

	.free_inode	= ntfs_free_big_inode, /* VFS: Deallocate inode. */

#ifdef NTFS_RW

	.write_inode	= ntfs_write_inode,	/* VFS: Write dirty inode to

						   disk. */