From 9377baabaf32e98d311c6004dbc735d2b1ea1d85 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 7 May 2009 23:25:29 +0200
Subject: [PATCH] --- yaml --- r: 173167 b: refs/heads/master c:
 d663af807d8bb226394cb7e02f4665f6141a8140 h: refs/heads/master i:   173165:
 59aaa0b6509a2bb708f9a447f598541316da2878   173163:
 2d2cb285af8f8c622d40a9f1d0dda6d0bbab1f90   173159:
 26e46dc84923b60d047495a03a754530227f24fd   173151:
 f83c724728620e20ba003ae22c93da2917bfdedd v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/reiserfs_fs.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 39e4ef0dbf7c..815260527b72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e43d3f21c502dec786f2885a75e25859f18d6ffa
+refs/heads/master: d663af807d8bb226394cb7e02f4665f6141a8140
diff --git a/trunk/include/linux/reiserfs_fs.h b/trunk/include/linux/reiserfs_fs.h
index 27f4ecc28180..508fb523863e 100644
--- a/trunk/include/linux/reiserfs_fs.h
+++ b/trunk/include/linux/reiserfs_fs.h
@@ -1348,9 +1348,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
 #define __fs_changed(gen,s) (gen != get_generation (s))
 #define fs_changed(gen,s)		\
 ({					\
-	reiserfs_write_unlock(s);	\
-	cond_resched();			\
-	reiserfs_write_lock(s);		\
+	reiserfs_cond_resched(s);	\
 	__fs_changed(gen, s);		\
 })