Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro: "Assorted misc bits and pieces. There are several single-topic branches left after this (rename2 series from Miklos, current_time series from Deepa Dinamani, xattr series from Andreas, uaccess stuff from from me) and I'd prefer to send those separately" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits) proc: switch auxv to use of __mem_open() hpfs: support FIEMAP cifs: get rid of unused arguments of CIFSSMBWrite() posix_acl: uapi header split posix_acl: xattr representation cleanups fs/aio.c: eliminate redundant loads in put_aio_ring_file fs/internal.h: add const to ns_dentry_operations declaration compat: remove compat_printk() fs/buffer.c: make __getblk_slow() static proc: unsigned file descriptors fs/file: more unsigned file descriptors fs: compat: remove redundant check of nr_segs cachefiles: Fix attempt to read i_blocks after deleting file [ver #2] cifs: don't use memcpy() to copy struct iov_iter get rid of separate multipage fault-in primitives fs: Avoid premature clearing of capabilities fs: Give dentry to inode_change_ok() instead of inode fuse: Propagate dentry down to inode_change_ok() ceph: Propagate dentry down to inode_change_ok() xfs: Propagate dentry down to inode_change_ok() ...
This commit is contained in:
@@ -2422,14 +2422,12 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
|
||||
*/
|
||||
if (priv->mac80211_registered) {
|
||||
char buf[100];
|
||||
struct dentry *mac80211_dir, *dev_dir, *root_dir;
|
||||
struct dentry *mac80211_dir, *dev_dir;
|
||||
|
||||
dev_dir = dbgfs_dir->d_parent;
|
||||
root_dir = dev_dir->d_parent;
|
||||
mac80211_dir = priv->hw->wiphy->debugfsdir;
|
||||
|
||||
snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name,
|
||||
dev_dir->d_name.name);
|
||||
snprintf(buf, 100, "../../%pd2", dev_dir);
|
||||
|
||||
if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))
|
||||
goto err;
|
||||
|
Reference in New Issue
Block a user