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

Commit 3aac2b62 authored by Al Viro's avatar Al Viro
Browse files

switch udf to ->evict_inode() 



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

fs/udf/ialloc.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ void udf_free_inode(struct inode *inode) 
	struct super_block *sb = inode->i_sb;

	struct udf_sb_info *sbi = UDF_SB(sb);



	clear_inode(inode);



	mutex_lock(&sbi->s_alloc_mutex);

	if (sbi->s_lvid_bh) {

		struct logicalVolIntegrityDescImpUse *lvidiu =

fs/udf/inode.c

+19 −29
Original line number Diff line number Diff line
@@ -68,37 +68,23 @@ static void udf_update_extents(struct inode *, 
static int udf_get_block(struct inode *, sector_t, struct buffer_head *, int);





void udf_delete_inode(struct inode *inode)

void udf_evict_inode(struct inode *inode)

{

	truncate_inode_pages(&inode->i_data, 0);

	struct udf_inode_info *iinfo = UDF_I(inode);

	int want_delete = 0;



	if (is_bad_inode(inode))

		goto no_delete;

	truncate_inode_pages(&inode->i_data, 0);



	if (!inode->i_nlink && !is_bad_inode(inode)) {

		want_delete = 1;

		inode->i_size = 0;

		udf_truncate(inode);

		lock_kernel();



		udf_update_inode(inode, IS_SYNC(inode));

	udf_free_inode(inode);



		unlock_kernel();

	return;



no_delete:

	clear_inode(inode);

	}



/*

 * If we are going to release inode from memory, we truncate last inode extent

 * to proper length. We could use drop_inode() but it's called under inode_lock

 * and thus we cannot mark inode dirty there.  We use clear_inode() but we have

 * to make sure to write inode as it's not written automatically.

 */

void udf_clear_inode(struct inode *inode)

{

	struct udf_inode_info *iinfo = UDF_I(inode);



	invalidate_inode_buffers(inode);

	end_writeback(inode);

	if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB &&

	    inode->i_size != iinfo->i_lenExtents) {

		printk(KERN_WARNING "UDF-fs (%s): Inode %lu (mode %o) has "
@@ -108,9 +94,13 @@ void udf_clear_inode(struct inode *inode) 
			(unsigned long long)inode->i_size,

			(unsigned long long)iinfo->i_lenExtents);

	}



	kfree(iinfo->i_ext.i_data);

	iinfo->i_ext.i_data = NULL;

	if (want_delete) {

		lock_kernel();

		udf_free_inode(inode);

		unlock_kernel();

	}

}



static int udf_writepage(struct page *page, struct writeback_control *wbc)

fs/udf/super.c

+1 −2
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ static const struct super_operations udf_sb_ops = { 
	.alloc_inode	= udf_alloc_inode,

	.destroy_inode	= udf_destroy_inode,

	.write_inode	= udf_write_inode,

	.delete_inode	= udf_delete_inode,

	.clear_inode	= udf_clear_inode,

	.evict_inode	= udf_evict_inode,

	.put_super	= udf_put_super,

	.sync_fs	= udf_sync_fs,

	.statfs		= udf_statfs,

fs/udf/udfdecl.h

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ extern struct buffer_head *udf_expand_dir_adinicb(struct inode *, int *, int *); 
extern struct buffer_head *udf_bread(struct inode *, int, int, int *);

extern void udf_truncate(struct inode *);

extern void udf_read_inode(struct inode *);

extern void udf_delete_inode(struct inode *);

extern void udf_clear_inode(struct inode *);

extern void udf_evict_inode(struct inode *);

extern int udf_write_inode(struct inode *, struct writeback_control *wbc);

extern long udf_block_map(struct inode *, sector_t);

extern int udf_extend_file(struct inode *, struct extent_position *,