diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:56:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:56:48 -0700 |
| commit | 938a73b959cf77aadc41bded3bf416b618aa20b3 (patch) | |
| tree | 812bdbf0d1dc219d55eaf0e66935a523669ca6c6 /fs/dlm/lowcomms.c | |
| parent | 45480aa75b03d6705ab5ceebda9d09be22f4e928 (diff) | |
| parent | f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 (diff) | |
| download | kernel_samsung_espresso10-938a73b959cf77aadc41bded3bf416b618aa20b3.zip kernel_samsung_espresso10-938a73b959cf77aadc41bded3bf416b618aa20b3.tar.gz kernel_samsung_espresso10-938a73b959cf77aadc41bded3bf416b618aa20b3.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
fs/dlm: Drop unnecessary null test
dlm: use genl_register_family_with_ops()
Diffstat (limited to 'fs/dlm/lowcomms.c')
| -rw-r--r-- | fs/dlm/lowcomms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index c0d35c6..37a34c2 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -248,7 +248,7 @@ static struct connection *assoc2con(int assoc_id) for (i = 0 ; i < CONN_HASH_SIZE; i++) { hlist_for_each_entry(con, h, &connection_hash[i], list) { - if (con && con->sctp_assoc == assoc_id) { + if (con->sctp_assoc == assoc_id) { mutex_unlock(&connections_lock); return con; } |