mirror of
				https://github.com/samba-team/samba.git
				synced 2025-10-31 12:23:52 +03:00 
			
		
		
		
	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 0ad4b1226c)
			
			
This commit is contained in:
		
				
					committed by
					
						 Gerald (Jerry) Carter
						Gerald (Jerry) Carter
					
				
			
			
				
	
			
			
			
						parent
						
							d1153fc790
						
					
				
				
					commit
					e6383f4762
				
			| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user