ceph: remove redundant test of head->safe and silence static analysis warnings

badone · idryomov · commit 1550d34e5626 · 2015-09-08T23:14:29.000+03:00
Signed-off-by: Brad Hubbard &lt;bhubbard@redhat.com&gt;
Signed-off-by: Yan, Zheng &lt;zyan@redhat.com&gt;
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
@@ -2415,7 +2415,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
 		mutex_unlock(&mdsc->mutex);
 		goto out;
 	}
-	if (req->r_got_safe && !head->safe) {
+	if (req->r_got_safe) {
 		pr_warn("got unsafe after safe on %llu from mds%d\n",
 			   tid, mds);
 		mutex_unlock(&mdsc->mutex);

Original file line number	Diff line number	Diff line change
`@@ -2415,7 +2415,7 @@ static void handle_reply(struct ceph_mds_session session, struct ceph_msg msg)`
`2415`	`2415`	`mutex_unlock(&mdsc->mutex);`
`2416`	`2416`	`goto out;`
`2417`	`2417`	`}`
`2418`		`- if (req->r_got_safe && !head->safe) {`
	`2418`	`+ if (req->r_got_safe) {`
`2419`	`2419`	`pr_warn("got unsafe after safe on %llu from mds%d\n",`
`2420`	`2420`	`tid, mds);`
`2421`	`2421`	`mutex_unlock(&mdsc->mutex);`