mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[PATCH] kernel: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in
linux/kernel/.
Signed-off-by: Josef "Jeff" Sipek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
c941192aaf
commit
f3a43f3f64
5 changed files with 16 additions and 16 deletions
|
|
@ -118,7 +118,7 @@ static int check_free_space(struct file *file)
|
|||
spin_unlock(&acct_globals.lock);
|
||||
|
||||
/* May block */
|
||||
if (vfs_statfs(file->f_dentry, &sbuf))
|
||||
if (vfs_statfs(file->f_path.dentry, &sbuf))
|
||||
return res;
|
||||
suspend = sbuf.f_blocks * SUSPEND;
|
||||
resume = sbuf.f_blocks * RESUME;
|
||||
|
|
@ -194,7 +194,7 @@ static void acct_file_reopen(struct file *file)
|
|||
add_timer(&acct_globals.timer);
|
||||
}
|
||||
if (old_acct) {
|
||||
mnt_unpin(old_acct->f_vfsmnt);
|
||||
mnt_unpin(old_acct->f_path.mnt);
|
||||
spin_unlock(&acct_globals.lock);
|
||||
do_acct_process(old_acct);
|
||||
filp_close(old_acct, NULL);
|
||||
|
|
@ -212,7 +212,7 @@ static int acct_on(char *name)
|
|||
if (IS_ERR(file))
|
||||
return PTR_ERR(file);
|
||||
|
||||
if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
|
||||
if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) {
|
||||
filp_close(file, NULL);
|
||||
return -EACCES;
|
||||
}
|
||||
|
|
@ -229,11 +229,11 @@ static int acct_on(char *name)
|
|||
}
|
||||
|
||||
spin_lock(&acct_globals.lock);
|
||||
mnt_pin(file->f_vfsmnt);
|
||||
mnt_pin(file->f_path.mnt);
|
||||
acct_file_reopen(file);
|
||||
spin_unlock(&acct_globals.lock);
|
||||
|
||||
mntput(file->f_vfsmnt); /* it's pinned, now give up active reference */
|
||||
mntput(file->f_path.mnt); /* it's pinned, now give up active reference */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -283,7 +283,7 @@ asmlinkage long sys_acct(const char __user *name)
|
|||
void acct_auto_close_mnt(struct vfsmount *m)
|
||||
{
|
||||
spin_lock(&acct_globals.lock);
|
||||
if (acct_globals.file && acct_globals.file->f_vfsmnt == m)
|
||||
if (acct_globals.file && acct_globals.file->f_path.mnt == m)
|
||||
acct_file_reopen(NULL);
|
||||
spin_unlock(&acct_globals.lock);
|
||||
}
|
||||
|
|
@ -299,7 +299,7 @@ void acct_auto_close(struct super_block *sb)
|
|||
{
|
||||
spin_lock(&acct_globals.lock);
|
||||
if (acct_globals.file &&
|
||||
acct_globals.file->f_vfsmnt->mnt_sb == sb) {
|
||||
acct_globals.file->f_path.mnt->mnt_sb == sb) {
|
||||
acct_file_reopen(NULL);
|
||||
}
|
||||
spin_unlock(&acct_globals.lock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue