From af49c6f0f065b248dbc801613ca407813a1e59a2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 26 Aug 2010 11:07:24 +0200 Subject: [PATCH] --- yaml --- r: 210056 b: refs/heads/master c: f44c3890d9fd6e4284518ff3bb16879fee194a3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/debugfs.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fed9251b2b99..24c58edb4a43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad8453ab0a5b98884074302ba3cc37664791e261 +refs/heads/master: f44c3890d9fd6e4284518ff3bb16879fee194a3a diff --git a/trunk/fs/ceph/debugfs.c b/trunk/fs/ceph/debugfs.c index 360c4f22718d..6fd8b20a8611 100644 --- a/trunk/fs/ceph/debugfs.c +++ b/trunk/fs/ceph/debugfs.c @@ -171,6 +171,8 @@ static int mdsc_show(struct seq_file *s, void *p) } else if (req->r_dentry) { path = ceph_mdsc_build_path(req->r_dentry, &pathlen, &pathbase, 0); + if (IS_ERR(path)) + path = NULL; spin_lock(&req->r_dentry->d_lock); seq_printf(s, " #%llx/%.*s (%s)", ceph_ino(req->r_dentry->d_parent->d_inode), @@ -187,6 +189,8 @@ static int mdsc_show(struct seq_file *s, void *p) if (req->r_old_dentry) { path = ceph_mdsc_build_path(req->r_old_dentry, &pathlen, &pathbase, 0); + if (IS_ERR(path)) + path = NULL; spin_lock(&req->r_old_dentry->d_lock); seq_printf(s, " #%llx/%.*s (%s)", ceph_ino(req->r_old_dentry->d_parent->d_inode),