diff --git a/[refs] b/[refs]
index f83c4ac5d2c3..68c368473a76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a18ec176c934ca1bc9dc61580a5e0e90a9b5733
+refs/heads/master: 8d56addd70c7c0626502569e22cc8fce49ae39f5
diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c
index bfed8447ed80..83543b5ff941 100644
--- a/trunk/fs/fuse/dir.c
+++ b/trunk/fs/fuse/dir.c
@@ -1283,8 +1283,11 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,
 	if (err)
 		return err;
 
-	if ((attr->ia_valid & ATTR_OPEN) && fc->atomic_o_trunc)
-		return 0;
+	if (attr->ia_valid & ATTR_OPEN) {
+		if (fc->atomic_o_trunc)
+			return 0;
+		file = NULL;
+	}
 
 	if (attr->ia_valid & ATTR_SIZE)
 		is_truncate = true;