4 files changed, 14 insertions, 19 deletions

diff --git a/fs/smbfs/Kconfig b/fs/smbfs/Kconfig
index e668127c8b2..2bc24a8c403 100644
--- a/fs/smbfs/Kconfig
+++ b/fs/smbfs/Kconfig
@@ -1,5 +1,6 @@
 config SMB_FS
         tristate "SMB file system support (OBSOLETE, please use CIFS)"
+        depends on BKL # probably unfixable
         depends on INET
         select NLS
         help
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 00a70cab1f3..f678d421e54 100644
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -406,21 +406,15 @@ void
 smb_renew_times(struct dentry * dentry)
 {
         dget(dentry);
-        spin_lock(&dentry->d_lock);
-        for (;;) {
-                struct dentry *parent;
+        dentry->d_time = jiffies;
 
-                dentry->d_time = jiffies;
-                if (IS_ROOT(dentry))
-                        break;
-                parent = dentry->d_parent;
-                dget(parent);
-                spin_unlock(&dentry->d_lock);
+        while (!IS_ROOT(dentry)) {
+                struct dentry *parent = dget_parent(dentry);
                 dput(dentry);
                 dentry = parent;
-                spin_lock(&dentry->d_lock);
+
+                dentry->d_time = jiffies;
         }
-        spin_unlock(&dentry->d_lock);
         dput(dentry);
 }
 
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 450c9194198..f6e9ee59757 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -229,7 +229,6 @@ smb_invalidate_inodes(struct smb_sb_info *server)
 {
         VERBOSE("\n");
         shrink_dcache_sb(SB_of(server));
-        invalidate_inodes(SB_of(server));
 }
 
 /*
@@ -501,6 +500,8 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
         void *mem;
         static int warn_count;
 
+        lock_kernel();
+
         if (warn_count < 5) {
                 warn_count++;
                 printk(KERN_EMERG "smbfs is deprecated and will be removed"
@@ -621,6 +622,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
 
         smb_new_dentry(sb->s_root);
 
+        unlock_kernel();
         return 0;
 
 out_no_root:
@@ -643,9 +645,11 @@ out_wrong_data:
 out_no_data:
         printk(KERN_ERR "smb_fill_super: missing data argument\n");
 out_fail:
+        unlock_kernel();
         return -EINVAL;
 out_no_server:
         printk(KERN_ERR "smb_fill_super: cannot allocate struct smb_sb_info\n");
+        unlock_kernel();
         return -ENOMEM;
 }
 
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 71c29b6670b..3dcf638d4d3 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);