This factors out protocol and low-level storage parts of ceph into a separate libceph module living in net/ceph and include/linux/ceph. This is mostly a matter of moving files around. However, a few key pieces of the interface change as well: - ceph_client becomes ceph_fs_client and ceph_client, where the latter captures the mon and osd clients, and the fs_client gets the mds client and file system specific pieces. - Mount option parsing and debugfs setup is correspondingly broken into two pieces. - The mon client gets a generic handler callback for otherwise unknown messages (mds map, in this case). - The basic supported/required feature bits can be expanded (and are by ceph_fs_client). No functional change, aside from some subtle error handling cases that got cleaned up in the refactoring process. Signed-off-by: Sage Weil <sage@newdream.net>
		
			
				
	
	
		
			38 lines
		
	
	
	
		
			929 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
	
		
			929 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef _FS_CEPH_DEBUG_H
 | 
						|
#define _FS_CEPH_DEBUG_H
 | 
						|
 | 
						|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 | 
						|
 | 
						|
#ifdef CONFIG_CEPH_LIB_PRETTYDEBUG
 | 
						|
 | 
						|
/*
 | 
						|
 * wrap pr_debug to include a filename:lineno prefix on each line.
 | 
						|
 * this incurs some overhead (kernel size and execution time) due to
 | 
						|
 * the extra function call at each call site.
 | 
						|
 */
 | 
						|
 | 
						|
# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
 | 
						|
extern const char *ceph_file_part(const char *s, int len);
 | 
						|
#  define dout(fmt, ...)						\
 | 
						|
	pr_debug("%.*s %12.12s:%-4d : " fmt,				\
 | 
						|
		 8 - (int)sizeof(KBUILD_MODNAME), "    ",		\
 | 
						|
		 ceph_file_part(__FILE__, sizeof(__FILE__)),		\
 | 
						|
		 __LINE__, ##__VA_ARGS__)
 | 
						|
# else
 | 
						|
/* faux printk call just to see any compiler warnings. */
 | 
						|
#  define dout(fmt, ...)	do {				\
 | 
						|
		if (0)						\
 | 
						|
			printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\
 | 
						|
	} while (0)
 | 
						|
# endif
 | 
						|
 | 
						|
#else
 | 
						|
 | 
						|
/*
 | 
						|
 * or, just wrap pr_debug
 | 
						|
 */
 | 
						|
# define dout(fmt, ...)	pr_debug(" " fmt, ##__VA_ARGS__)
 | 
						|
 | 
						|
#endif
 | 
						|
 | 
						|
#endif
 |