summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 09:35:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:52 -0500
commite6383f47629368d9dd4e803f17566a24e9d7359e (patch)
treecebde89910087c3220786f209da2c4e32a71bc46 /source3/include
parentd1153fc79076741571b203b1d70f1536bde208f0 (diff)
downloadsamba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is just too much hassle. No functional change (I hope ;-)) Volker (This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/locking.h6
-rw-r--r--source3/include/messages.h10
-rw-r--r--source3/include/smb.h10
-rw-r--r--source3/include/smb_share_modes.h2
4 files changed, 10 insertions, 18 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h
index a62b461c10..cc4d83fdcd 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -39,7 +39,7 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
struct lock_context {
uint32 smbpid;
uint16 tid;
- struct process_id pid;
+ struct server_id pid;
};
/* The key used in the brlock database. */
@@ -61,13 +61,13 @@ struct byte_range_lock {
};
#define BRLOCK_FN_CAST() \
- void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
+ void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct server_id pid, \
enum brl_type lock_type, \
enum brl_flavour lock_flav, \
br_off start, br_off size)
#define BRLOCK_FN(fn) \
- void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
+ void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct server_id pid, \
enum brl_type lock_type, \
enum brl_flavour lock_flav, \
br_off start, br_off size)
diff --git a/source3/include/messages.h b/source3/include/messages.h
index 7cd0e02348..e3f29832ad 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -96,16 +96,8 @@
#define FLAG_MSG_PRINT_NOTIFY 0x0008
#define FLAG_MSG_PRINT_GENERAL 0x0010
-struct process_id {
- pid_t pid;
-};
-
-/*
- * Samba4 API compatibility layer
- */
-
struct server_id {
- struct process_id id;
+ pid_t pid;
};
#endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 6c44db5a34..f903772254 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -744,7 +744,7 @@ struct pending_message_list {
/* struct returned by get_share_modes */
struct share_mode_entry {
- struct process_id pid;
+ struct server_id pid;
uint16 op_mid;
uint16 op_type;
uint32 access_mask; /* NTCreateX access bits (FILE_READ_DATA etc.) */
@@ -764,7 +764,7 @@ struct share_mode_entry {
/* oplock break message definition - linearization of share_mode_entry.
Offset Data length.
-0 struct process_id pid 4
+0 struct server_id pid 4
4 uint16 op_mid 2
6 uint16 op_type 2
8 uint32 access_mask 4
@@ -822,7 +822,7 @@ struct locking_data {
/* Used to store pipe open records for NetFileEnum() */
struct pipe_open_rec {
- struct process_id pid;
+ struct server_id pid;
uid_t uid;
int pnum;
fstring name;
@@ -869,14 +869,14 @@ struct pipe_open_rec {
/* key and data in the connections database - used in smbstatus and smbd */
struct connections_key {
- struct process_id pid;
+ struct server_id pid;
int cnum;
fstring name;
};
struct connections_data {
int magic;
- struct process_id pid;
+ struct server_id pid;
int cnum;
uid_t uid;
gid_t gid;
diff --git a/source3/include/smb_share_modes.h b/source3/include/smb_share_modes.h
index 5ed43bda33..937a39c97a 100644
--- a/source3/include/smb_share_modes.h
+++ b/source3/include/smb_share_modes.h
@@ -51,7 +51,7 @@ struct smb_share_mode_entry {
uint32_t access_mask;
struct timeval open_time;
uint32_t file_id;
- struct process_id pid;
+ struct server_id pid;
};
/*