diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:43:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:43:17 -0400 |
| commit | 38ebb1e0ed214efe124534eba4a34e869a0d8da7 (patch) | |
| tree | 3712611527654e81109d194d903401c86763e3f4 /include/linux/lockd | |
| parent | 236a686b56428a8967a057a2396f9be74e2ee652 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
| download | blackbird-op-linux-38ebb1e0ed214efe124534eba4a34e869a0d8da7.tar.gz blackbird-op-linux-38ebb1e0ed214efe124534eba4a34e869a0d8da7.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/lockd')
| -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 { unsigned int b_id; /* block id */ unsigned char b_queued; /* re-queued */ unsigned char b_granted; /* VFS granted lock */ - unsigned char b_done; /* callback complete */ struct nlm_file * b_file; /* file in question */ }; |
