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: (52 commits)
  split invalidate_inodes()
  fs: skip I_FREEING inodes in writeback_sb_inodes
  fs: fold invalidate_list into invalidate_inodes
  fs: do not drop inode_lock in dispose_list
  fs: inode split IO and LRU lists
  fs: switch bdev inode bdi's correctly
  fs: fix buffer invalidation in invalidate_list
  fsnotify: use dget_parent
  smbfs: use dget_parent
  exportfs: use dget_parent
  fs: use RCU read side protection in d_validate
  fs: clean up dentry lru modification
  fs: split __shrink_dcache_sb
  fs: improve DCACHE_REFERENCED usage
  fs: use percpu counter for nr_dentry and nr_dentry_unused
  fs: simplify __d_free
  fs: take dcache_lock inside __d_path
  fs: do not assign default i_ino in new_inode
  fs: introduce a per-cpu last_ino allocator
  new helper: ihold()
  ...

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 71c29b6670b4..3dcf638d4d3a 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -332,16 +332,15 @@ static int smb_build_path(struct smb_sb_info *server, unsigned char *buf,
          * and store it in reversed order [see reverse_string()]
          */
         dget(entry);
-        spin_lock(&entry->d_lock);
         while (!IS_ROOT(entry)) {
                 struct dentry *parent;
 
                 if (maxlen < (3<<unicode)) {
-                        spin_unlock(&entry->d_lock);
                         dput(entry);
                         return -ENAMETOOLONG;
                 }
 
+                spin_lock(&entry->d_lock);
                 len = server->ops->convert(path, maxlen-2, 
                                       entry->d_name.name, entry->d_name.len,
                                       server->local_nls, server->remote_nls);
@@ -359,15 +358,12 @@ static int smb_build_path(struct smb_sb_info *server, unsigned char *buf,
                 }
                 *path++ = '\\';
                 maxlen -= len+1;
-
-                parent = entry->d_parent;
-                dget(parent);
                 spin_unlock(&entry->d_lock);
+
+                parent = dget_parent(entry);
                 dput(entry);
                 entry = parent;
-                spin_lock(&entry->d_lock);
         }
-        spin_unlock(&entry->d_lock);
         dput(entry);
         reverse_string(buf, path-buf);