Merge tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[karo-tx-linux.git] / drivers / base / devtmpfs.c

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 147d1a4dd2694eb05a5366cf0a47317eec729479..01fc5b07f951f81e6521e9c89af797f9838d165b 100644 (file)
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -148,7 +148,7 @@ static int dev_mkdir(const char *name, umode_t mode)
        struct path path;
        int err;
 
-       dentry = kern_path_create(AT_FDCWD, name, &path, 1);
+       dentry = kern_path_create(AT_FDCWD, name, &path, LOOKUP_DIRECTORY);
        if (IS_ERR(dentry))
                return PTR_ERR(dentry);
 
@@ -302,7 +302,8 @@ static int handle_remove(const char *nodename, struct device *dev)
 
        if (dentry->d_inode) {
                struct kstat stat;
-               err = vfs_getattr(parent.mnt, dentry, &stat);
+               struct path p = {.mnt = parent.mnt, .dentry = dentry};
+               err = vfs_getattr(&p, &stat);
                if (!err && dev_mynode(dev, dentry->d_inode, &stat)) {
                        struct iattr newattrs;
                        /*