diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 06:03:38 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 06:03:38 +0200 |
commit | badc48e6605ddeeb2484afae5993c859494decaa (patch) | |
tree | 7da638f9bb53b1812b71e40ad6deca91d59ad301 /fs/autofs4/autofs_i.h | |
parent | Merge branch 'upstream-fixes' into upstream (diff) | |
parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff) | |
download | linux-badc48e6605ddeeb2484afae5993c859494decaa.tar.xz linux-badc48e6605ddeeb2484afae5993c859494decaa.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/autofs4/autofs_i.h')
-rw-r--r-- | fs/autofs4/autofs_i.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index 57c4903614e5..d6603d02304c 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -74,8 +74,8 @@ struct autofs_wait_queue { struct autofs_wait_queue *next; autofs_wqt_t wait_queue_token; /* We use the following to see what we are waiting for */ - int hash; - int len; + unsigned int hash; + unsigned int len; char *name; u32 dev; u64 ino; @@ -85,7 +85,6 @@ struct autofs_wait_queue { pid_t tgid; /* This is for status reporting upon return */ int status; - atomic_t notify; atomic_t wait_ctr; }; |