From 710b49ab3c8586095305409e169e83761ef51a0c Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Mon, 28 Feb 2011 17:04:11 +0530 Subject: [PATCH] --- yaml --- r: 235049 b: refs/heads/master c: 3dc5436aa5719be029bbc2bef0e5cb0312e4ff88 h: refs/heads/master i: 235047: 8be6d9125ea5c21f4adcbe6649f82a8057a3dd1b v: v3 --- [refs] | 2 +- trunk/fs/9p/vfs_inode.c | 4 ++++ trunk/fs/9p/vfs_inode_dotl.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ee605fa443ae..b53a89d66cb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f10fc50f1adaf40fdd5da6dd154ecb464b468e2f +refs/heads/master: 3dc5436aa5719be029bbc2bef0e5cb0312e4ff88 diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c index 2555776920ad..8a2c232f708a 100644 --- a/trunk/fs/9p/vfs_inode.c +++ b/trunk/fs/9p/vfs_inode.c @@ -999,6 +999,10 @@ static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr) if (retval) return retval; } + /* Write all dirty data */ + if (S_ISREG(dentry->d_inode->i_mode)) + filemap_write_and_wait(dentry->d_inode->i_mapping); + retval = p9_client_wstat(fid, &wstat); if (retval < 0) return retval; diff --git a/trunk/fs/9p/vfs_inode_dotl.c b/trunk/fs/9p/vfs_inode_dotl.c index bcd0ee2e549a..67c138e94feb 100644 --- a/trunk/fs/9p/vfs_inode_dotl.c +++ b/trunk/fs/9p/vfs_inode_dotl.c @@ -459,6 +459,10 @@ int v9fs_vfs_setattr_dotl(struct dentry *dentry, struct iattr *iattr) if (retval) return retval; } + /* Write all dirty data */ + if (S_ISREG(dentry->d_inode->i_mode)) + filemap_write_and_wait(dentry->d_inode->i_mapping); + retval = p9_client_setattr(fid, &p9attr); if (retval < 0) return retval;