---

yaml --- r: 23525 b: refs/heads/master c: 619d5d8 h: refs/heads/master i: 23523: 0f0fe44 v: v3
git-mirror · Mar 25, 2006 · ad4b3e0 · ad4b3e0
1 parent 748e033
commit ad4b3e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a44c94a7b82a425b73384c104d5cb3dd3caa075e
+refs/heads/master: 619d5d8a2b3f800ea3a0301a58ede570684956b0
diff --git a/trunk/fs/reiserfs/file.c b/trunk/fs/reiserfs/file.c
@@ -1546,10 +1546,10 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
 		}
 	}
 
-	if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
-		res =
-		    generic_osync_inode(inode, file->f_mapping,
-					OSYNC_METADATA | OSYNC_DATA);
+	if (likely(res >= 0) &&
+	    (unlikely((file->f_flags & O_SYNC) || IS_SYNC(inode))))
+		res = generic_osync_inode(inode, file->f_mapping,
+		                          OSYNC_METADATA | OSYNC_DATA);
 
 	mutex_unlock(&inode->i_mutex);
 	reiserfs_async_progress_wait(inode->i_sb);