From 244595c656925f5f816fe300e8d46be2f68e517f Mon Sep 17 00:00:00 2001 From: jvrao Date: Mon, 30 Aug 2010 13:23:20 -0500 Subject: [PATCH] --- yaml --- r: 218941 b: refs/heads/master c: 8d40fa2492eb3dcf02468eef2f6bba450be42b22 h: refs/heads/master i: 218939: ae7843d2b19f0b45f542a4e3782f309c81ec34dc v: v3 --- [refs] | 2 +- trunk/fs/9p/vfs_file.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index eddb0a12755c..3487c2363853 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e24ad2ff9d477f949acd0982cf12e58812210cb +refs/heads/master: 8d40fa2492eb3dcf02468eef2f6bba450be42b22 diff --git a/trunk/fs/9p/vfs_file.c b/trunk/fs/9p/vfs_file.c index 89c44e92022c..f455c45a8c5f 100644 --- a/trunk/fs/9p/vfs_file.c +++ b/trunk/fs/9p/vfs_file.c @@ -221,7 +221,7 @@ v9fs_file_write(struct file *filp, const char __user * data, { ssize_t retval; size_t total = 0; - int n, rsize; + int n; struct p9_fid *fid; struct p9_client *clnt; struct inode *inode = filp->f_path.dentry->d_inode; @@ -234,8 +234,6 @@ v9fs_file_write(struct file *filp, const char __user * data, fid = filp->private_data; clnt = fid->clnt; - rsize = fid->iounit ? fid->iounit : clnt->msize - P9_IOHDRSZ; - retval = generic_write_checks(filp, &origin, &count, 0); if (retval) goto out; @@ -248,11 +246,7 @@ v9fs_file_write(struct file *filp, const char __user * data, goto out; do { - if (count < rsize) - rsize = count; - - n = p9_client_write(fid, NULL, data+total, origin+total, - rsize); + n = p9_client_write(fid, NULL, data+total, origin+total, count); if (n <= 0) break; count -= n;