summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-02-13 21:03:16 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-02-13 21:03:16 -0500
commitf4086a3d789dbe18949862276d83b8f49fce6d2f (patch)
tree4b4c65765c66e00397b14b1839ea775cb73e851e /include/linux
parent813b00d63f6ca1ed40a2f4f9c034d59bc424025e (diff)
downloadlinux-stable-f4086a3d789dbe18949862276d83b8f49fce6d2f.tar.gz
linux-stable-f4086a3d789dbe18949862276d83b8f49fce6d2f.tar.bz2
linux-stable-f4086a3d789dbe18949862276d83b8f49fce6d2f.zip
NFS: struct nfs_commit_info.lock must always point to inode->i_lock
Commit 411a99adffb4f (nfs: clear_request_commit while holding i_lock) assumes that the nfs_commit_info always points to the inode->i_lock. For historical reasons, that is not the case for O_DIRECT writes. Cc: Weston Andros Adamson <dros@primarydata.com> Fixes: 411a99adffb4f ("nfs: clear_request_commit while holding i_lock") Cc: stable@vger.kernel.org # 3.17.x Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/nfs_xdr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 38d96ba935c2..9a39132fda49 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1351,7 +1351,7 @@ struct nfs_commit_completion_ops {
};
struct nfs_commit_info {
- spinlock_t *lock;
+ spinlock_t *lock; /* inode->i_lock */
struct nfs_mds_commit_info *mds;
struct pnfs_ds_commit_info *ds;
struct nfs_direct_req *dreq; /* O_DIRECT request */