diff options
author | J. Bruce Fields <bfields@redhat.com> | 2014-05-08 11:19:41 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-05-21 11:11:21 -0400 |
commit | 27b11428b7de097c42f205beabb1764f4365443b (patch) | |
tree | 65f2c0c4be1291545d437f39d28e5f3ce2ca4180 | |
parent | a1b8ff4c97b4375d21b6d6c45d75877303f61b3b (diff) |
nfsd4: warn on finding lockowner without stateid's
The current code assumes a one-to-one lockowner<->lock stateid
correspondance.
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-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 89e42409b237..9a77a5a21557 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -4166,6 +4166,10 @@ static bool same_lockowner_ino(struct nfs4_lockowner *lo, struct inode *inode, c | |||
4166 | 4166 | ||
4167 | if (!same_owner_str(&lo->lo_owner, owner, clid)) | 4167 | if (!same_owner_str(&lo->lo_owner, owner, clid)) |
4168 | return false; | 4168 | return false; |
4169 | if (list_empty(&lo->lo_owner.so_stateids)) { | ||
4170 | WARN_ON_ONCE(1); | ||
4171 | return false; | ||
4172 | } | ||
4169 | lst = list_first_entry(&lo->lo_owner.so_stateids, | 4173 | lst = list_first_entry(&lo->lo_owner.so_stateids, |
4170 | struct nfs4_ol_stateid, st_perstateowner); | 4174 | struct nfs4_ol_stateid, st_perstateowner); |
4171 | return lst->st_file->fi_inode == inode; | 4175 | return lst->st_file->fi_inode == inode; |