patch-1.3.21 linux/fs/smbfs/file.c
Next file: linux/fs/smbfs/inode.c
Previous file: linux/fs/smbfs/dir.c
Back to the patch index
Back to the overall index
- Lines: 63
- Date:
Mon Aug 28 09:48:36 1995
- Orig file:
v1.3.20/linux/fs/smbfs/file.c
- Orig date:
Wed Aug 2 13:21:15 1995
diff -u --recursive --new-file v1.3.20/linux/fs/smbfs/file.c linux/fs/smbfs/file.c
@@ -102,10 +102,25 @@
/* First read in as much as possible for each bufsize. */
while (already_read < count) {
- to_read = min(bufsize, count - already_read);
+ result = 0;
+ to_read = 0;
+
+ if ((SMB_SERVER(inode)->blkmode & 1) != 0) {
+ to_read = min(65535, count - already_read);
+ DPRINTK("smb_file_read: Raw %d bytes\n", to_read);
+ result = smb_proc_read_raw(SMB_SERVER(inode),
+ SMB_FINFO(inode),
+ pos, to_read, buf);
+ DPRINTK("smb_file_read: returned %d\n", result);
+ }
+
+ if (result <= 0) {
+ to_read = min(bufsize, count - already_read);
+ result = smb_proc_read(SMB_SERVER(inode),
+ SMB_FINFO(inode),
+ pos, to_read, buf, 1);
+ }
- result = smb_proc_read(SMB_SERVER(inode), SMB_FINFO(inode),
- pos, to_read, buf, 1);
if (result < 0)
return result;
pos += result;
@@ -162,12 +177,30 @@
already_written = 0;
+ DPRINTK("smb_write_file: blkmode = %d, blkmode & 2 = %d\n",
+ SMB_SERVER(inode)->blkmode,
+ SMB_SERVER(inode)->blkmode & 2);
+
while (already_written < count) {
- to_write = min(bufsize, count - already_written);
+ result = 0;
+ to_write = 0;
- result = smb_proc_write(SMB_SERVER(inode), SMB_FINFO(inode),
- pos, to_write, buf);
+ if ((SMB_SERVER(inode)->blkmode & 2) != 0) {
+ to_write = min(65535, count - already_written);
+ DPRINTK("smb_file_write: Raw %d bytes\n", to_write);
+ result = smb_proc_write_raw(SMB_SERVER(inode),
+ SMB_FINFO(inode),
+ pos, to_write, buf);
+ DPRINTK("smb_file_write: returned %d\n", result);
+ }
+
+ if (result <= 0) {
+ to_write = min(bufsize, count - already_written);
+ result = smb_proc_write(SMB_SERVER(inode),
+ SMB_FINFO(inode),
+ pos, to_write, buf);
+ }
if (result < 0)
return result;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this