projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proc: export a processes resource limits via /proc/pid
[powerpc.git]
/
fs
/
autofs4
/
waitq.c
diff --git
a/fs/autofs4/waitq.c
b/fs/autofs4/waitq.c
index
1e4a539
..
1fe28e4
100644
(file)
--- a/
fs/autofs4/waitq.c
+++ b/
fs/autofs4/waitq.c
@@
-84,7
+84,11
@@
static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
struct autofs_wait_queue *wq,
int type)
{
struct autofs_wait_queue *wq,
int type)
{
- union autofs_packet_union pkt;
+ union {
+ struct autofs_packet_hdr hdr;
+ union autofs_packet_union v4_pkt;
+ union autofs_v5_packet_union v5_pkt;
+ } pkt;
size_t pktsz;
DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d",
size_t pktsz;
DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d",
@@
-98,7
+102,7
@@
static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
/* Kernel protocol v4 missing and expire packets */
case autofs_ptype_missing:
{
/* Kernel protocol v4 missing and expire packets */
case autofs_ptype_missing:
{
- struct autofs_packet_missing *mp = &pkt.missing;
+ struct autofs_packet_missing *mp = &pkt.
v4_pkt.
missing;
pktsz = sizeof(*mp);
pktsz = sizeof(*mp);
@@
-110,7
+114,7
@@
static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
}
case autofs_ptype_expire_multi:
{
}
case autofs_ptype_expire_multi:
{
- struct autofs_packet_expire_multi *ep = &pkt.expire_multi;
+ struct autofs_packet_expire_multi *ep = &pkt.
v4_pkt.
expire_multi;
pktsz = sizeof(*ep);
pktsz = sizeof(*ep);
@@
-129,7
+133,7
@@
static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
case autofs_ptype_missing_direct:
case autofs_ptype_expire_direct:
{
case autofs_ptype_missing_direct:
case autofs_ptype_expire_direct:
{
- struct autofs_v5_packet *packet = &pkt.v5_packet;
+ struct autofs_v5_packet *packet = &pkt.v5_p
kt.v5_p
acket;
pktsz = sizeof(*packet);
pktsz = sizeof(*packet);
@@
-372,7
+376,7
@@
int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
struct autofs_wait_queue *wq, **wql;
mutex_lock(&sbi->wq_mutex);
struct autofs_wait_queue *wq, **wql;
mutex_lock(&sbi->wq_mutex);
- for (wql = &sbi->queues
; (wq = *wql) != 0
; wql = &wq->next) {
+ for (wql = &sbi->queues
; (wq = *wql) != NULL
; wql = &wq->next) {
if (wq->wait_queue_token == wait_queue_token)
break;
}
if (wq->wait_queue_token == wait_queue_token)
break;
}