diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-06 10:58:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-06 10:58:04 +1100 |
| commit | 8f99a5c7b12c77c857abd4ec1192799efc54c71b (patch) | |
| tree | 7ad98a8b64580e70fbbd23feb712859716b9152c /drivers/block | |
| parent | 75388c55cf933f12055c40fb9ad7a96666dcb8e3 (diff) | |
| parent | 9c883c360fd0502271edadb3e1e476f53ffe1253 (diff) | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_debugfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c index 900d4d3272d1..9a950022ff88 100644 --- a/drivers/block/drbd/drbd_debugfs.c +++ b/drivers/block/drbd/drbd_debugfs.c @@ -419,7 +419,7 @@ static int in_flight_summary_show(struct seq_file *m, void *pos) return 0; } -/* simple_positive(file->f_dentry) respectively debugfs_positive(), +/* simple_positive(file->f_path.dentry) respectively debugfs_positive(), * but neither is "reachable" from here. * So we have our own inline version of it above. :-( */ static inline int debugfs_positive(struct dentry *dentry) @@ -437,14 +437,14 @@ static int drbd_single_open(struct file *file, int (*show)(struct seq_file *, vo /* Are we still linked, * or has debugfs_remove() already been called? */ - parent = file->f_dentry->d_parent; + parent = file->f_path.dentry->d_parent; /* not sure if this can happen: */ if (!parent || !parent->d_inode) goto out; /* serialize with d_delete() */ mutex_lock(&parent->d_inode->i_mutex); /* Make sure the object is still alive */ - if (debugfs_positive(file->f_dentry) + if (debugfs_positive(file->f_path.dentry) && kref_get_unless_zero(kref)) ret = 0; mutex_unlock(&parent->d_inode->i_mutex); |