fix statfs bug and a truncation issue.

diff --git a/lustre/obdfs/rw.c b/lustre/obdfs/rw.c
index 218e366..19f1032 100644 (file)
--- a/lustre/obdfs/rw.c
+++ b/lustre/obdfs/rw.c
@@ -384,7 +384,8 @@ int obdfs_commit_write(struct file *file, struct page *page, unsigned from, unsi
         int rc;
         struct inode *inode = page->mapping->host;
         loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
-        rc = obdfs_writepage(page);
+       // XXX test with synchronous writes
+        rc = obdfs_do_writepage(page, 1);
         kunmap(page);
         if (pos > inode->i_size) {
                 inode->i_size = pos;

diff --git a/lustre/obdfs/super.c b/lustre/obdfs/super.c
index 6332866..faf46bb 100644 (file)
--- a/lustre/obdfs/super.c
+++ b/lustre/obdfs/super.c
@@ -459,7 +459,6 @@ int obdfs_notify_change(struct dentry *de, struct iattr *attr)
 static int obdfs_statfs(struct super_block *sb, struct statfs *buf)
 {
         struct statfs tmp;
-        int bufsize = sizeof(*buf);
         int err;
 
         ENTRY;
@@ -469,8 +468,8 @@ static int obdfs_statfs(struct super_block *sb, struct statfs *buf)
                 printk(__FUNCTION__ ": obd_statfs fails (%d)\n", err);
                 return err;
         }
-        copy_to_user(buf, &tmp, (bufsize<sizeof(tmp)) ? bufsize : sizeof(tmp));
-
+       memcpy(buf, &tmp, sizeof(*buf));
+       CDEBUG(D_SUPER, "statfs returns avail %ld\n", tmp.f_bavail);
         EXIT;
 
         return err;