summaryrefslogtreecommitdiffstats
path: root/fs/ceph/caps.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-08-20 14:22:02 -0400
committerIlya Dryomov <idryomov@gmail.com>2017-09-06 13:56:52 -0400
commitd37b1d9943d5138b9b2630b7b7082629a82a1386 (patch)
treebf904513456933cbd93e22ce0068e2a6e34802a5 /fs/ceph/caps.c
parentb529d1b382f77ec6221f9c5fffb17939e92629e4 (diff)
ceph: adjust 36 checks for NULL pointers
The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written ... Thus fix the affected source code places. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Reviewed-by: Yan, Zheng <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/caps.c')
-rw-r--r--fs/ceph/caps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index f1c5691e8e2c..662ada467c32 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -611,7 +611,7 @@ void ceph_add_cap(struct inode *inode,
611 } 611 }
612 612
613 if (flags & CEPH_CAP_FLAG_AUTH) { 613 if (flags & CEPH_CAP_FLAG_AUTH) {
614 if (ci->i_auth_cap == NULL || 614 if (!ci->i_auth_cap ||
615 ceph_seq_cmp(ci->i_auth_cap->mseq, mseq) < 0) { 615 ceph_seq_cmp(ci->i_auth_cap->mseq, mseq) < 0) {
616 ci->i_auth_cap = cap; 616 ci->i_auth_cap = cap;
617 cap->mds_wanted = wanted; 617 cap->mds_wanted = wanted;
@@ -728,7 +728,7 @@ static void __touch_cap(struct ceph_cap *cap)
728 struct ceph_mds_session *s = cap->session; 728 struct ceph_mds_session *s = cap->session;
729 729
730 spin_lock(&s->s_cap_lock); 730 spin_lock(&s->s_cap_lock);
731 if (s->s_cap_iterator == NULL) { 731 if (!s->s_cap_iterator) {
732 dout("__touch_cap %p cap %p mds%d\n", &cap->ci->vfs_inode, cap, 732 dout("__touch_cap %p cap %p mds%d\n", &cap->ci->vfs_inode, cap,
733 s->s_mds); 733 s->s_mds);
734 list_move_tail(&cap->session_caps, &s->s_caps); 734 list_move_tail(&cap->session_caps, &s->s_caps);