diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/locking.h | 9 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h index 88104b0fef..5504da6dc3 100644 --- a/source3/include/locking.h +++ b/source3/include/locking.h @@ -43,14 +43,7 @@ struct lock_context { struct files_struct; -struct file_id { - /* we don't use SMB_DEV_T and SMB_INO_T as we want a fixed size here, - and we may be using file system specific code to fill in something - other than a dev_t for the device */ - uint64_t devid; - uint64_t inode; - uint64_t extid; /* Support systems that use an extended id (e.g. snapshots). */ -}; +#include "../librpc/gen_ndr/file_id.h" struct byte_range_lock { struct files_struct *fsp; diff --git a/source3/include/proto.h b/source3/include/proto.h index a3597cc2c8..29dbcc9763 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1584,9 +1584,6 @@ unsigned wins_srv_count_tag(const char *tag); enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r); enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r); void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r); -enum ndr_err_code ndr_push_file_id(struct ndr_push *ndr, int ndr_flags, const struct file_id *r); -enum ndr_err_code ndr_pull_file_id(struct ndr_pull *ndr, int ndr_flags, struct file_id *r); -void ndr_print_file_id(struct ndr_print *ndr, const char *name, const struct file_id *r); _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss); const char *ndr_errstr(enum ndr_err_code err); extern const struct ndr_syntax_id null_ndr_syntax_id; |