--- zzzz-none-000/linux-2.6.19.2/fs/nfsd/nfs4proc.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/fs/nfsd/nfs4proc.c	2007-01-11 07:38:19.000000000 +0000
@@ -93,7 +93,6 @@
 {
 	struct svc_fh resfh;
 	__be32 status;
-	int created = 0;
 
 	fh_init(&resfh, NFS4_FHSIZE);
 	open->op_truncate = 0;
@@ -106,27 +105,28 @@
 		status = nfsd_create_v3(rqstp, current_fh, open->op_fname.data,
 					open->op_fname.len, &open->op_iattr,
 					&resfh, open->op_createmode,
-					(u32 *)open->op_verf.data, &open->op_truncate, &created);
-	} else {
+					(u32 *)open->op_verf.data, &open->op_truncate);
+	}
+	else {
 		status = nfsd_lookup(rqstp, current_fh,
 				     open->op_fname.data, open->op_fname.len, &resfh);
 		fh_unlock(current_fh);
 	}
-	if (status)
-		goto out;
 
-	set_change_info(&open->op_cinfo, current_fh);
+	if (!status) {
+		set_change_info(&open->op_cinfo, current_fh);
 
-	/* set reply cache */
-	fh_dup2(current_fh, &resfh);
-	open->op_stateowner->so_replay.rp_openfh_len = resfh.fh_handle.fh_size;
-	memcpy(open->op_stateowner->so_replay.rp_openfh,
-			&resfh.fh_handle.fh_base, resfh.fh_handle.fh_size);
+		/* set reply cache */
+		fh_dup2(current_fh, &resfh);
+		open->op_stateowner->so_replay.rp_openfh_len =
+			resfh.fh_handle.fh_size;
+		memcpy(open->op_stateowner->so_replay.rp_openfh,
+				&resfh.fh_handle.fh_base,
+				resfh.fh_handle.fh_size);
 
-	if (!created)
 		status = do_open_permission(rqstp, current_fh, open, MAY_NOP);
+	}
 
-out:
 	fh_put(&resfh);
 	return status;
 }