diff options
author | J. Bruce Fields <bfields@redhat.com> | 2014-05-08 11:19:41 -0400 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-09 15:53:34 +0200 |
commit | a55dfea8623fadef4f0985be3f84a54a92718192 (patch) | |
tree | 612a46a3ce89051c7c2c620d92df5e8ad3f8026f | |
parent | 723ac81c8671b3a095d9eb303974c7bc9964b506 (diff) |
nfsd4: warn on finding lockowner without stateid's
commit 27b11428b7de097c42f205beabb1764f4365443b upstream.
The current code assumes a one-to-one lockowner<->lock stateid
correspondance.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b21ed5e5b36..6f1250c1460 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4142,6 +4142,10 @@ static bool same_lockowner_ino(struct nfs4_lockowner *lo, struct inode *inode, c if (!same_owner_str(&lo->lo_owner, owner, clid)) return false; + if (list_empty(&lo->lo_owner.so_stateids)) { + WARN_ON_ONCE(1); + return false; + } lst = list_first_entry(&lo->lo_owner.so_stateids, struct nfs4_ol_stateid, st_perstateowner); return lst->st_file->fi_inode == inode; |