korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

acct: switch to __kernel_write()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-04-19 14:37:20 -04:00
parent ecfdb33d1f
commit ed44724b79
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/internal.h
View File

@ -131,7 +131,6 @@ extern long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan,
/* /*
* read_write.c * read_write.c
*/ */
extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
extern int rw_verify_area(int, struct file *, const loff_t *, size_t); extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
/* /*

1
include/linux/fs.h
View File

@ -2335,6 +2335,7 @@ extern int do_pipe_flags(int *, int);
extern int kernel_read(struct file *, loff_t, char *, unsigned long); extern int kernel_read(struct file *, loff_t, char *, unsigned long);
extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t); extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t);
extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
extern struct file * open_exec(const char *); extern struct file * open_exec(const char *);
/* fs/dcache.c -- generic fs support functions */ /* fs/dcache.c -- generic fs support functions */

31
kernel/acct.c
View File

@ -456,12 +456,16 @@ static void do_acct_process(struct bsd_acct_struct *acct,
{ {
struct pacct_struct *pacct = &current->signal->pacct; struct pacct_struct *pacct = &current->signal->pacct;
acct_t ac; acct_t ac;
mm_segment_t fs;
unsigned long flim; unsigned long flim;
u64 elapsed, run_time; u64 elapsed, run_time;
struct tty_struct *tty; struct tty_struct *tty;
const struct cred *orig_cred; const struct cred *orig_cred;
/*
* Accounting records are not subject to resource limits.
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
/* Perform file operations on behalf of whoever enabled accounting */ /* Perform file operations on behalf of whoever enabled accounting */
orig_cred = override_creds(file->f_cred); orig_cred = override_creds(file->f_cred);
@ -536,25 +540,14 @@ static void do_acct_process(struct bsd_acct_struct *acct,
* Get freeze protection. If the fs is frozen, just skip the write * Get freeze protection. If the fs is frozen, just skip the write
* as we could deadlock the system otherwise. * as we could deadlock the system otherwise.
*/ */
if (!file_start_write_trylock(file)) if (file_start_write_trylock(file)) {
goto out; /* it's been opened O_APPEND, so position is irrelevant */
/* loff_t pos = 0;
* Kernel segment override to datasegment and write it __kernel_write(file, (char *)&ac, sizeof(acct_t), &pos);
* to the accounting file. file_end_write(file);
*/ }
fs = get_fs();
set_fs(KERNEL_DS);
/*
* Accounting records are not subject to resource limits.
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
file->f_op->write(file, (char *)&ac,
sizeof(acct_t), &file->f_pos);
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
file_end_write(file);
out: out:
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
revert_creds(orig_cred); revert_creds(orig_cred);
} }