mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
new helper: file_inode(file)
Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
57eccb830f
commit
496ad9aa8e
306 changed files with 696 additions and 717 deletions
|
|
@ -99,7 +99,7 @@ static int ext3_readdir(struct file * filp,
|
|||
int i, stored;
|
||||
struct ext3_dir_entry_2 *de;
|
||||
int err;
|
||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct super_block *sb = inode->i_sb;
|
||||
int ret = 0;
|
||||
int dir_has_error = 0;
|
||||
|
|
@ -114,7 +114,7 @@ static int ext3_readdir(struct file * filp,
|
|||
* We don't set the inode dirty flag since it's not
|
||||
* critical that it get flushed back to the disk.
|
||||
*/
|
||||
EXT3_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL;
|
||||
EXT3_I(file_inode(filp))->i_flags &= ~EXT3_INDEX_FL;
|
||||
}
|
||||
stored = 0;
|
||||
offset = filp->f_pos & (sb->s_blocksize - 1);
|
||||
|
|
@ -457,7 +457,7 @@ static int call_filldir(struct file * filp, void * dirent,
|
|||
{
|
||||
struct dir_private_info *info = filp->private_data;
|
||||
loff_t curr_pos;
|
||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct super_block * sb;
|
||||
int error;
|
||||
|
||||
|
|
@ -487,7 +487,7 @@ static int ext3_dx_readdir(struct file * filp,
|
|||
void * dirent, filldir_t filldir)
|
||||
{
|
||||
struct dir_private_info *info = filp->private_data;
|
||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct fname *fname;
|
||||
int ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct inode *inode = filp->f_dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct ext3_inode_info *ei = EXT3_I(inode);
|
||||
unsigned int flags;
|
||||
unsigned short rsv_window_size;
|
||||
|
|
|
|||
|
|
@ -624,7 +624,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
|
|||
|
||||
dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash,
|
||||
start_minor_hash));
|
||||
dir = dir_file->f_path.dentry->d_inode;
|
||||
dir = file_inode(dir_file);
|
||||
if (!(EXT3_I(dir)->i_flags & EXT3_INDEX_FL)) {
|
||||
hinfo.hash_version = EXT3_SB(dir->i_sb)->s_def_hash_version;
|
||||
if (hinfo.hash_version <= DX_HASH_TEA)
|
||||
|
|
@ -638,7 +638,7 @@ int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
|
|||
}
|
||||
hinfo.hash = start_hash;
|
||||
hinfo.minor_hash = 0;
|
||||
frame = dx_probe(NULL, dir_file->f_path.dentry->d_inode, &hinfo, frames, &err);
|
||||
frame = dx_probe(NULL, file_inode(dir_file), &hinfo, frames, &err);
|
||||
if (!frame)
|
||||
return err;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue