leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acct: eliminate compile warning

Browse Source 
If ACCT_VERSION is not defined to 3, below warning appears:
  CC      kernel/acct.o
  kernel/acct.c: In function `do_acct_process':
  kernel/acct.c:475:24: warning: unused variable `ns' [-Wunused-variable]

[akpm@linux-foundation.org: retain the local for code size improvements
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ying Xue 2014-10-09 15:30:21 -07:00 committed by Linus Torvalds
parent 27fb10edca
commit 067b722faf
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/acct.c
View File

@ -472,7 +472,6 @@ static void do_acct_process(struct bsd_acct_struct *acct)
acct_t ac; acct_t ac;
unsigned long flim; unsigned long flim;
const struct cred *orig_cred; const struct cred *orig_cred;
struct pid_namespace *ns = acct->ns;
struct file *file = acct->file; struct file *file = acct->file;
/* /*
@ -500,10 +499,15 @@ static void do_acct_process(struct bsd_acct_struct *acct)
ac.ac_gid16 = ac.ac_gid; ac.ac_gid16 = ac.ac_gid;
#endif #endif
#if ACCT_VERSION == 3 #if ACCT_VERSION == 3
ac.ac_pid = task_tgid_nr_ns(current, ns); {
rcu_read_lock(); struct pid_namespace *ns = acct->ns;
ac.ac_ppid = task_tgid_nr_ns(rcu_dereference(current->real_parent), ns);
rcu_read_unlock(); ac.ac_pid = task_tgid_nr_ns(current, ns);
rcu_read_lock();
ac.ac_ppid = task_tgid_nr_ns(rcu_dereference(current->real_parent),
ns);
rcu_read_unlock();
}
#endif #endif
/* /*
* Get freeze protection. If the fs is frozen, just skip the write * Get freeze protection. If the fs is frozen, just skip the write