diff options
| author | Tom Haynes <loghyr@primarydata.com> | 2014-12-11 13:04:55 -0500 |
|---|---|---|
| committer | Tom Haynes <loghyr@primarydata.com> | 2015-02-03 11:06:31 -0800 |
| commit | 085d1e33a6a8495d9afa58ad2b8b7ea74d613515 (patch) | |
| tree | 3f39d90c0ccbce5f8f67ab3667304f18d22de70b /fs/nfs/direct.c | |
| parent | f54bcf2ecee982da47c2baf8bd87fd9ad9984651 (diff) | |
| download | lwn-085d1e33a6a8495d9afa58ad2b8b7ea74d613515.tar.gz lwn-085d1e33a6a8495d9afa58ad2b8b7ea74d613515.zip | |
pnfs: Do not grab the commit_info lock twice when rescheduling writes
Acked-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 10bf07280f4a..e84f764b9dcd 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -573,6 +573,20 @@ out: return result; } +static void +nfs_direct_write_scan_commit_list(struct inode *inode, + struct list_head *list, + struct nfs_commit_info *cinfo) +{ + spin_lock(cinfo->lock); +#ifdef CONFIG_NFS_V4_1 + if (cinfo->ds != NULL && cinfo->ds->nwritten != 0) + NFS_SERVER(inode)->pnfs_curr_ld->recover_commit_reqs(list, cinfo); +#endif + nfs_scan_commit_list(&cinfo->mds->list, list, cinfo, 0); + spin_unlock(cinfo->lock); +} + static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) { struct nfs_pageio_descriptor desc; @@ -582,10 +596,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) LIST_HEAD(failed); nfs_init_cinfo_from_dreq(&cinfo, dreq); - pnfs_recover_commit_reqs(dreq->inode, &reqs, &cinfo); - spin_lock(cinfo.lock); - nfs_scan_commit_list(&cinfo.mds->list, &reqs, &cinfo, 0); - spin_unlock(cinfo.lock); + nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo); dreq->count = 0; get_dreq(dreq); |