fs/nfs/inode.c | 2 +- fs/nfs/write.c | 9 ++++----- include/linux/nfs_fs.h | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff -u --recursive --new-file linux-2.6.0-test9/fs/nfs/inode.c linux-2.6.0-01-fix_commit/fs/nfs/inode.c --- linux-2.6.0-test9/fs/nfs/inode.c 2003-11-16 00:37:12.000000000 -0500 +++ linux-2.6.0-01-fix_commit/fs/nfs/inode.c 2003-11-16 16:35:52.000000000 -0500 @@ -118,7 +118,7 @@ { int flags = sync ? FLUSH_WAIT : 0; - nfs_commit_file(inode, NULL, 0, 0, flags); + nfs_commit_file(inode, NULL, flags); } static void diff -u --recursive --new-file linux-2.6.0-test9/fs/nfs/write.c linux-2.6.0-01-fix_commit/fs/nfs/write.c --- linux-2.6.0-test9/fs/nfs/write.c 2003-11-16 00:36:58.000000000 -0500 +++ linux-2.6.0-01-fix_commit/fs/nfs/write.c 2003-11-16 16:35:42.000000000 -0500 @@ -280,7 +280,7 @@ if (is_sync && wbc->sync_mode == WB_SYNC_ALL) { err = nfs_wb_all(inode); } else - nfs_commit_file(inode, NULL, 0, 0, 0); + nfs_commit_file(inode, NULL, 0); out: return err; } @@ -1065,15 +1065,14 @@ } #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) -int nfs_commit_file(struct inode *inode, struct file *file, unsigned long idx_start, - unsigned int npages, int how) +int nfs_commit_file(struct inode *inode, struct file *file, int how) { LIST_HEAD(head); int res, error = 0; spin_lock(&nfs_wreq_lock); - res = nfs_scan_commit(inode, &head, file, idx_start, npages); + res = nfs_scan_commit(inode, &head, file, 0, 0); spin_unlock(&nfs_wreq_lock); if (res) error = nfs_commit_list(&head, how); @@ -1103,7 +1102,7 @@ error = nfs_flush_file(inode, file, idx_start, npages, how); #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) if (error == 0) - error = nfs_commit_file(inode, file, idx_start, npages, how); + error = nfs_commit_file(inode, file, how); #endif } while (error > 0); return error; diff -u --recursive --new-file linux-2.6.0-test9/include/linux/nfs_fs.h linux-2.6.0-01-fix_commit/include/linux/nfs_fs.h --- linux-2.6.0-test9/include/linux/nfs_fs.h 2003-11-16 00:34:43.000000000 -0500 +++ linux-2.6.0-01-fix_commit/include/linux/nfs_fs.h 2003-11-16 16:36:30.000000000 -0500 @@ -313,12 +313,11 @@ extern int nfs_flush_file(struct inode *, struct file *, unsigned long, unsigned int, int); extern int nfs_flush_list(struct list_head *, int, int); #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) -extern int nfs_commit_file(struct inode *, struct file *, unsigned long, unsigned int, int); +extern int nfs_commit_file(struct inode *, struct file *, int); extern int nfs_commit_list(struct list_head *, int); #else static inline int -nfs_commit_file(struct inode *inode, struct file *file, unsigned long offset, - unsigned int len, int flags) +nfs_commit_file(struct inode *inode, struct file *file, int flags) { return 0; }