lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd: track last inode only in use_wgather case

Browse Source 
Updating last_ino and last_dev probably isn't useful in the !use_wgather
case.

Also remove some pointless ifdef'd-out code.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields
2009-06-15 18:47:56 -07:00
parent 6aad89c837
commit 9d2a3f31d6
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/vfs.c
View File

@@ -1026,7 +1026,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID))) if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID)))
kill_suid(dentry); kill_suid(dentry);
if (host_err >= 0 && stable) { if (host_err >= 0 && stable && use_wgather) {
static ino_t last_ino; static ino_t last_ino;
static dev_t last_dev; static dev_t last_dev;
@@ -1042,7 +1042,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
* nice and simple solution (IMHO), and it seems to * nice and simple solution (IMHO), and it seems to
* work:-) * work:-)
*/ */
if (use_wgather) {
if (atomic_read(&inode->i_writecount) > 1 if (atomic_read(&inode->i_writecount) > 1
|| (last_ino == inode->i_ino && last_dev == inode->i_sb->s_dev)) { || (last_ino == inode->i_ino && last_dev == inode->i_sb->s_dev)) {
dprintk("nfsd: write defer %d\n", task_pid_nr(current)); dprintk("nfsd: write defer %d\n", task_pid_nr(current));
@@ -1054,10 +1053,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
dprintk("nfsd: write sync %d\n", task_pid_nr(current)); dprintk("nfsd: write sync %d\n", task_pid_nr(current));
host_err=nfsd_sync(file); host_err=nfsd_sync(file);
} }
#if 0
wake_up(&inode->i_wait);
#endif
}
last_ino = inode->i_ino; last_ino = inode->i_ino;
last_dev = inode->i_sb->s_dev; last_dev = inode->i_sb->s_dev;
} }