git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd/create race fixes, infrastructure
[safe/jmp/linux-2.6]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index
d8646c2
..
ce6d8ea
100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-1121,9
+1121,7
@@
unsigned int audit_serial(void)
static inline void audit_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial)
{
static inline void audit_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial)
{
- if (ctx)
- auditsc_get_stamp(ctx, t, serial);
- else {
+ if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
*t = CURRENT_TIME;
*serial = audit_serial();
}
*t = CURRENT_TIME;
*serial = audit_serial();
}