Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)
  vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp
  isofs: Remove global fs lock
  jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory
  fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.
  mm/truncate.c: fix build for CONFIG_BLOCK not enabled
  fs:update the NOTE of the file_operations structure
  Remove dead code in dget_parent()
  AFS: Fix silly characters in a comment
  switch d_add_ci() to d_splice_alias() in "found negative" case as well
  simplify gfs2_lookup()
  jfs_lookup(): don't bother with . or ..
  get rid of useless dget_parent() in btrfs rename() and link()
  get rid of useless dget_parent() in fs/btrfs/ioctl.c
  fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
  drivers: fix up various ->llseek() implementations
  fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek
  Ext4: handle SEEK_HOLE/SEEK_DATA generically
  Btrfs: implement our own ->llseek
  fs: add SEEK_HOLE and SEEK_DATA flags
  reiserfs: make reiserfs default to barrier=flush
  ...

Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new
shrinker callout for the inode cache, that clashed with the xfs code to
start the periodic workers later.

2 files changed, 22 insertions, 27 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 7389b7da3a8d..c50818f0473b 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -97,8 +97,7 @@ static int
 rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
 {
         static uint32_t clntid;
-        struct nameidata nd;
-        struct path path;
+        struct path path, dir;
         char name[15];
         struct qstr q = {
                 .name = name,
@@ -113,7 +112,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
         path.mnt = rpc_get_mount();
         if (IS_ERR(path.mnt))
                 return PTR_ERR(path.mnt);
-        error = vfs_path_lookup(path.mnt->mnt_root, path.mnt, dir_name, 0, &nd);
+        error = vfs_path_lookup(path.mnt->mnt_root, path.mnt, dir_name, 0, &dir);
         if (error)
                 goto err;
 
@@ -121,7 +120,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
                 q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++);
                 name[sizeof(name) - 1] = '\0';
                 q.hash = full_name_hash(q.name, q.len);
-                path.dentry = rpc_create_client_dir(nd.path.dentry, &q, clnt);
+                path.dentry = rpc_create_client_dir(dir.dentry, &q, clnt);
                 if (!IS_ERR(path.dentry))
                         break;
                 error = PTR_ERR(path.dentry);
@@ -132,11 +131,11 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
                         goto err_path_put;
                 }
         }
-        path_put(&nd.path);
+        path_put(&dir);
         clnt->cl_path = path;
         return 0;
 err_path_put:
-        path_put(&nd.path);
+        path_put(&dir);
 err:
         rpc_put_mount();
         return error;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0722a25a3a33..ec68e1c05b85 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -808,8 +808,9 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         struct net *net = sock_net(sk);
         struct unix_sock *u = unix_sk(sk);
         struct sockaddr_un *sunaddr = (struct sockaddr_un *)uaddr;
+        char *sun_path = sunaddr->sun_path;
         struct dentry *dentry = NULL;
-        struct nameidata nd;
+        struct path path;
         int err;
         unsigned hash;
         struct unix_address *addr;
@@ -845,48 +846,44 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         addr->hash = hash ^ sk->sk_type;
         atomic_set(&addr->refcnt, 1);
 
-        if (sunaddr->sun_path[0]) {
+        if (sun_path[0]) {
                 unsigned int mode;
                 err = 0;
                 /*
                  * Get the parent directory, calculate the hash for last
                  * component.
                  */
-                err = kern_path_parent(sunaddr->sun_path, &nd);
-                if (err)
-                        goto out_mknod_parent;
-
-                dentry = lookup_create(&nd, 0);
+                dentry = kern_path_create(AT_FDCWD, sun_path, &path, 0);
                 err = PTR_ERR(dentry);
                 if (IS_ERR(dentry))
-                        goto out_mknod_unlock;
+                        goto out_mknod_parent;
 
                 /*
                  * All right, let's create it.
                  */
                 mode = S_IFSOCK |
                        (SOCK_INODE(sock)->i_mode & ~current_umask());
-                err = mnt_want_write(nd.path.mnt);
+                err = mnt_want_write(path.mnt);
                 if (err)
                         goto out_mknod_dput;
-                err = security_path_mknod(&nd.path, dentry, mode, 0);
+                err = security_path_mknod(&path, dentry, mode, 0);
                 if (err)
                         goto out_mknod_drop_write;
-                err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
+                err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
 out_mknod_drop_write:
-                mnt_drop_write(nd.path.mnt);
+                mnt_drop_write(path.mnt);
                 if (err)
                         goto out_mknod_dput;
-                mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-                dput(nd.path.dentry);
-                nd.path.dentry = dentry;
+                mutex_unlock(&path.dentry->d_inode->i_mutex);
+                dput(path.dentry);
+                path.dentry = dentry;
 
                 addr->hash = UNIX_HASH_SIZE;
         }
 
         spin_lock(&unix_table_lock);
 
-        if (!sunaddr->sun_path[0]) {
+        if (!sun_path[0]) {
                 err = -EADDRINUSE;
                 if (__unix_find_socket_byname(net, sunaddr, addr_len,
                                               sk->sk_type, hash)) {
@@ -897,8 +894,8 @@ out_mknod_drop_write:
                 list = &unix_socket_table[addr->hash];
         } else {
                 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-                u->dentry = nd.path.dentry;
-                u->mnt    = nd.path.mnt;
+                u->dentry = path.dentry;
+                u->mnt    = path.mnt;
         }
 
         err = 0;
@@ -915,9 +912,8 @@ out:
 
 out_mknod_dput:
         dput(dentry);
-out_mknod_unlock:
-        mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-        path_put(&nd.path);
+        mutex_unlock(&path.dentry->d_inode->i_mutex);
+        path_put(&path);
 out_mknod_parent:
         if (err == -EEXIST)
                 err = -EADDRINUSE;