---

yaml
---
r: 138871
b: refs/heads/master
c: ee93961
h: refs/heads/master
i:
  138869: 382e30e
  138867: 570c11b
  138863: 1943476
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68caa9530a8ba54f97002e02bf6a0ad2462b8c0
+refs/heads/master: ee93961be1faddf9e9a638bc519145c20f0cfeba

trunk/fs/reiserfs/file.c

@@ -138,19 +138,19 @@ static int reiserfs_sync_file(struct file *filp,
 			      struct dentry *dentry, int datasync)
 {
 	struct inode *inode = dentry->d_inode;
-	int n_err;
+	int err;
 	int barrier_done;
 
 	BUG_ON(!S_ISREG(inode->i_mode));
-	n_err = sync_mapping_buffers(inode->i_mapping);
+	err = sync_mapping_buffers(inode->i_mapping);
 	reiserfs_write_lock(inode->i_sb);
 	barrier_done = reiserfs_commit_for_inode(inode);
 	reiserfs_write_unlock(inode->i_sb);
 	if (barrier_done != 1 && reiserfs_barrier_flush(inode->i_sb))
 		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
 	if (barrier_done < 0)
 		return barrier_done;
-	return (n_err < 0) ? -EIO : 0;
+	return (err < 0) ? -EIO : 0;
 }
 
 /* taken fs/buffer.c:__block_commit_write */