Commit bb7720a0 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Fold udf_fill_inode() into __udf_read_inode() 



There's no good reason to separate these since udf_fill_inode() is
called only from __udf_read_inode() and both do part of the same thing.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 8a70ee33

fs/udf/inode.c

+5 −17
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ MODULE_LICENSE("GPL"); 


static umode_t udf_convert_permissions(struct fileEntry *);

static int udf_update_inode(struct inode *, int);

static void udf_fill_inode(struct inode *, struct buffer_head *);

static int udf_sync_inode(struct inode *inode);

static int udf_alloc_i_data(struct inode *inode, size_t size);

static sector_t inode_getblk(struct inode *, sector_t, int *, int *);
@@ -1275,8 +1274,11 @@ static void __udf_read_inode(struct inode *inode) 
{

	struct buffer_head *bh = NULL;

	struct fileEntry *fe;

	struct extendedFileEntry *efe;

	uint16_t ident;

	struct udf_inode_info *iinfo = UDF_I(inode);

	struct udf_sb_info *sbi = UDF_SB(inode->i_sb);

	unsigned int link_count;



	/*

	 * Set defaults, but the inode is still incomplete!
@@ -1307,6 +1309,7 @@ static void __udf_read_inode(struct inode *inode) 
	}



	fe = (struct fileEntry *)bh->b_data;

	efe = (struct extendedFileEntry *)bh->b_data;



	if (fe->icbTag.strategyType == cpu_to_le16(4096)) {

		struct buffer_head *ibh;
@@ -1346,22 +1349,6 @@ static void __udf_read_inode(struct inode *inode) 
		make_bad_inode(inode);

		return;

	}

	udf_fill_inode(inode, bh);



	brelse(bh);

}



static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)

{

	struct fileEntry *fe;

	struct extendedFileEntry *efe;

	struct udf_sb_info *sbi = UDF_SB(inode->i_sb);

	struct udf_inode_info *iinfo = UDF_I(inode);

	unsigned int link_count;



	fe = (struct fileEntry *)bh->b_data;

	efe = (struct extendedFileEntry *)bh->b_data;



	if (fe->icbTag.strategyType == cpu_to_le16(4))

		iinfo->i_strat4096 = 0;

	else /* if (fe->icbTag.strategyType == cpu_to_le16(4096)) */
@@ -1551,6 +1538,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) 
		} else

			make_bad_inode(inode);

	}

	brelse(bh);

}



static int udf_alloc_i_data(struct inode *inode, size_t size)