Browse Source

fs/ceph: replace pr_warning by pr_warn

Update the last pr_warning callsites in fs branch

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Sage Weil <sage@inktank.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Fabian Frederick 11 years ago
parent
commit
f3ae1b97be
4 changed files with 6 additions and 6 deletions
  1. 1 1
      fs/ceph/addr.c
  2. 1 1
      fs/ceph/inode.c
  3. 3 3
      fs/ceph/mds_client.c
  4. 1 1
      fs/ceph/mdsmap.c

+ 1 - 1
fs/ceph/addr.c

@@ -694,7 +694,7 @@ static int ceph_writepages_start(struct address_space *mapping,
 	     (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));
 	     (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));
 
 
 	if (fsc->mount_state == CEPH_MOUNT_SHUTDOWN) {
 	if (fsc->mount_state == CEPH_MOUNT_SHUTDOWN) {
-		pr_warning("writepage_start %p on forced umount\n", inode);
+		pr_warn("writepage_start %p on forced umount\n", inode);
 		return -EIO; /* we're in a forced umount, don't write! */
 		return -EIO; /* we're in a forced umount, don't write! */
 	}
 	}
 	if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize)
 	if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize)

+ 1 - 1
fs/ceph/inode.c

@@ -821,7 +821,7 @@ no_change:
 			spin_unlock(&ci->i_ceph_lock);
 			spin_unlock(&ci->i_ceph_lock);
 		}
 		}
 	} else if (cap_fmode >= 0) {
 	} else if (cap_fmode >= 0) {
-		pr_warning("mds issued no caps on %llx.%llx\n",
+		pr_warn("mds issued no caps on %llx.%llx\n",
 			   ceph_vinop(inode));
 			   ceph_vinop(inode));
 		__ceph_get_fmode(ci, cap_fmode);
 		__ceph_get_fmode(ci, cap_fmode);
 	}
 	}

+ 3 - 3
fs/ceph/mds_client.c

@@ -2218,13 +2218,13 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
 	/* dup? */
 	/* dup? */
 	if ((req->r_got_unsafe && !head->safe) ||
 	if ((req->r_got_unsafe && !head->safe) ||
 	    (req->r_got_safe && head->safe)) {
 	    (req->r_got_safe && head->safe)) {
-		pr_warning("got a dup %s reply on %llu from mds%d\n",
+		pr_warn("got a dup %s reply on %llu from mds%d\n",
 			   head->safe ? "safe" : "unsafe", tid, mds);
 			   head->safe ? "safe" : "unsafe", tid, mds);
 		mutex_unlock(&mdsc->mutex);
 		mutex_unlock(&mdsc->mutex);
 		goto out;
 		goto out;
 	}
 	}
 	if (req->r_got_safe && !head->safe) {
 	if (req->r_got_safe && !head->safe) {
-		pr_warning("got unsafe after safe on %llu from mds%d\n",
+		pr_warn("got unsafe after safe on %llu from mds%d\n",
 			   tid, mds);
 			   tid, mds);
 		mutex_unlock(&mdsc->mutex);
 		mutex_unlock(&mdsc->mutex);
 		goto out;
 		goto out;
@@ -3525,7 +3525,7 @@ static void peer_reset(struct ceph_connection *con)
 	struct ceph_mds_session *s = con->private;
 	struct ceph_mds_session *s = con->private;
 	struct ceph_mds_client *mdsc = s->s_mdsc;
 	struct ceph_mds_client *mdsc = s->s_mdsc;
 
 
-	pr_warning("mds%d closed our session\n", s->s_mds);
+	pr_warn("mds%d closed our session\n", s->s_mds);
 	send_mds_reconnect(mdsc, s);
 	send_mds_reconnect(mdsc, s);
 }
 }
 
 

+ 1 - 1
fs/ceph/mdsmap.c

@@ -62,7 +62,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
 
 
 	ceph_decode_16_safe(p, end, version, bad);
 	ceph_decode_16_safe(p, end, version, bad);
 	if (version > 3) {
 	if (version > 3) {
-		pr_warning("got mdsmap version %d > 3, failing", version);
+		pr_warn("got mdsmap version %d > 3, failing", version);
 		goto bad;
 		goto bad;
 	}
 	}