git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Make use of MODULE_FIRMWARE
[pandora-kernel.git]
/
kernel
/
acct.c
diff --git
a/kernel/acct.c
b/kernel/acct.c
index
ca56190
..
70d0d88
100644
(file)
--- a/
kernel/acct.c
+++ b/
kernel/acct.c
@@
-118,7
+118,7
@@
static int check_free_space(struct file *file)
spin_unlock(&acct_globals.lock);
/* May block */
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;
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) {
add_timer(&acct_globals.timer);
}
if (old_acct) {
- mnt_unpin(old_acct->f_
vfs
mnt);
+ mnt_unpin(old_acct->f_
path.
mnt);
spin_unlock(&acct_globals.lock);
do_acct_process(old_acct);
filp_close(old_acct, NULL);
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 (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;
}
filp_close(file, NULL);
return -EACCES;
}
@@
-229,11
+229,11
@@
static int acct_on(char *name)
}
spin_lock(&acct_globals.lock);
}
spin_lock(&acct_globals.lock);
- mnt_pin(file->f_
vfs
mnt);
+ mnt_pin(file->f_
path.
mnt);
acct_file_reopen(file);
spin_unlock(&acct_globals.lock);
acct_file_reopen(file);
spin_unlock(&acct_globals.lock);
- mntput(file->f_
vfs
mnt); /* it's pinned, now give up active reference */
+ mntput(file->f_
path.
mnt); /* it's pinned, now give up active reference */
return 0;
}
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);
void acct_auto_close_mnt(struct vfsmount *m)
{
spin_lock(&acct_globals.lock);
- if (acct_globals.file && acct_globals.file->f_
vfs
mnt == m)
+ if (acct_globals.file && acct_globals.file->f_
path.
mnt == m)
acct_file_reopen(NULL);
spin_unlock(&acct_globals.lock);
}
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 &&
{
spin_lock(&acct_globals.lock);
if (acct_globals.file &&
- acct_globals.file->f_
vfs
mnt->mnt_sb == sb) {
+ acct_globals.file->f_
path.
mnt->mnt_sb == sb) {
acct_file_reopen(NULL);
}
spin_unlock(&acct_globals.lock);
acct_file_reopen(NULL);
}
spin_unlock(&acct_globals.lock);
@@
-485,12
+485,9
@@
static void do_acct_process(struct file *file)
ac.ac_ppid = current->parent->tgid;
#endif
ac.ac_ppid = current->parent->tgid;
#endif
- mutex_lock(&tty_mutex);
- tty = get_current_tty();
- ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0;
- mutex_unlock(&tty_mutex);
-
spin_lock_irq(¤t->sighand->siglock);
spin_lock_irq(¤t->sighand->siglock);
+ tty = current->signal->tty;
+ ac.ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0;
ac.ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime)));
ac.ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime)));
ac.ac_flag = pacct->ac_flag;
ac.ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime)));
ac.ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime)));
ac.ac_flag = pacct->ac_flag;