patch-2.2.2 linux/fs/smbfs/file.c

• Lines: 33
• Date: Wed Feb 17 15:59:32 1999
• Orig file: v2.2.1/linux/fs/smbfs/file.c
• Orig date: Thu Nov 12 16:21:23 1998

diff -u --recursive --new-file v2.2.1/linux/fs/smbfs/file.c linux/fs/smbfs/file.c
@@ -144,7 +144,7 @@
 
 		result = smb_proc_write(dentry, offset, wsize, buffer);
 		if (result < 0)
-			goto io_error;
+			break;
 		/* N.B. what if result < wsize?? */
 #ifdef SMBFS_PARANOIA
 if (result < wsize)
@@ -162,15 +162,7 @@
 			inode->i_size = offset;
 		inode->u.smbfs_i.cache_valid |= SMB_F_LOCALWRITE;
 	} while (count);
-
-out:
-	smb_unlock_page(page);
 	return written ? written : result;
-
-io_error:
-	/* Must mark the page invalid after I/O error */
-	clear_bit(PG_uptodate, &page->flags);
-	goto out;
 }
 
 /*
@@ -190,6 +182,7 @@
 	set_bit(PG_locked, &page->flags);
 	atomic_inc(&page->count);
 	result = smb_writepage_sync(dentry, page, 0, PAGE_SIZE);
+	smb_unlock_page(page);
 	free_page(page_address(page));
 	return result;
 }