commit 6bd5cb1762c6edc04736f055954a66ddca4336eb
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Wed Nov 21 21:55:53 2007 -0500
Unionfs: cleaner support for RT patches
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 8dbf79a..7e75a39 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -88,6 +88,13 @@ extern struct export_operations unionfs_export_ops;
#define init_export_op(sb) do {} while (0)
#endif /* not (CONFIG_EXPORTFS || CONFIG_EXPORTFS_MODULE) */
+/* compatibility with Real-Time patches */
+#ifdef CONFIG_PREEMPT_RT
+# define unionfs_rw_semaphore compat_rw_semaphore
+#else /* not CONFIG_PREEMPT_RT */
+# define unionfs_rw_semaphore rw_semaphore
+#endif /* not CONFIG_PREEMPT_RT */
+
/* file private data. */
struct unionfs_file_info {
int bstart;
@@ -187,11 +194,7 @@ struct unionfs_sb_info {
* branch-management is used on a pivot_root'ed union, because we
* have to ->lookup paths which belong to the same union.
*/
-#ifdef CONFIG_PREEMPT_RT
- struct compat_rw_semaphore rwsem;
-#else /* not CONFIG_PREEMPT_RT */
- struct rw_semaphore rwsem;
-#endif /* not CONFIG_PREEMPT_RT */
+ struct unionfs_rw_semaphore rwsem;
pid_t write_lock_owner; /* PID of rw_sem owner (write lock) */
int high_branch_id; /* last unique branch ID given */
struct odf_sb_info odf;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
