diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /fs/ceph/debugfs.c | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ceph/debugfs.c')
| -rw-r--r-- | fs/ceph/debugfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c index 360c4f22718d..6fd8b20a8611 100644 --- a/fs/ceph/debugfs.c +++ b/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), |