diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /include/linux/lockd/lockd.h | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/lockd/lockd.h')
| -rw-r--r-- | include/linux/lockd/lockd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index aa4fe905bb4d..0d92c468d55a 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -123,7 +123,6 @@ struct nlm_block { | |||
| 123 | unsigned int b_id; /* block id */ | 123 | unsigned int b_id; /* block id */ |
| 124 | unsigned char b_queued; /* re-queued */ | 124 | unsigned char b_queued; /* re-queued */ |
| 125 | unsigned char b_granted; /* VFS granted lock */ | 125 | unsigned char b_granted; /* VFS granted lock */ |
| 126 | unsigned char b_done; /* callback complete */ | ||
| 127 | struct nlm_file * b_file; /* file in question */ | 126 | struct nlm_file * b_file; /* file in question */ |
| 128 | }; | 127 | }; |
| 129 | 128 | ||