diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-24 17:08:31 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-24 17:08:31 -0400 |
| commit | 362745268ce119c473952b30f57d947bdede7f7a (patch) | |
| tree | d5632a60c88af58d77914c421ab11596b3c450f5 /fs/nfs/pnfs_nfs.c | |
| parent | Merge branch 'sunrpc' (diff) | |
| parent | pNFS/files: filelayout_write_done_cb must call nfs_writeback_update_inode() (diff) | |
| download | linux-dev-362745268ce119c473952b30f57d947bdede7f7a.tar.xz linux-dev-362745268ce119c473952b30f57d947bdede7f7a.zip | |
Merge branch 'writeback'
Diffstat (limited to 'fs/nfs/pnfs_nfs.c')
| -rw-r--r-- | fs/nfs/pnfs_nfs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index fe183fbc4b90..f3468b57a32a 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -940,6 +940,13 @@ EXPORT_SYMBOL_GPL(pnfs_layout_mark_request_commit); int pnfs_nfs_generic_sync(struct inode *inode, bool datasync) { + int ret; + + if (!pnfs_layoutcommit_outstanding(inode)) + return 0; + ret = nfs_commit_inode(inode, FLUSH_SYNC); + if (ret < 0) + return ret; if (datasync) return 0; return pnfs_layoutcommit_inode(inode, true); |