7 files changed, 27 insertions, 25 deletions

diff --git a/fs/smbfs/cache.c b/fs/smbfs/cache.c
index 74b86d9725a6..8182f0542a21 100644
--- a/fs/smbfs/cache.c
+++ b/fs/smbfs/cache.c
@@ -125,7 +125,7 @@ smb_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
                struct smb_cache_control *ctrl, struct qstr *qname,
                struct smb_fattr *entry)
 {
-        struct dentry *newdent, *dentry = filp->f_dentry;
+        struct dentry *newdent, *dentry = filp->f_path.dentry;
         struct inode *newino, *inode = dentry->d_inode;
         struct smb_cache_control ctl = *ctrl;
         int valid = 0;
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 70d9c5a37f5a..b1e58d1ac9ca 100644
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -78,7 +78,7 @@ struct inode_operations smb_dir_inode_operations_unix =
 static int 
 smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-        struct dentry *dentry = filp->f_dentry;
+        struct dentry *dentry = filp->f_path.dentry;
         struct inode *dir = dentry->d_inode;
         struct smb_sb_info *server = server_from_dentry(dentry);
         union  smb_dir_cache *cache = NULL;
@@ -238,12 +238,12 @@ out:
 static int
 smb_dir_open(struct inode *dir, struct file *file)
 {
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
         struct smb_sb_info *server;
         int error = 0;
 
         VERBOSE("(%s/%s)\n", dentry->d_parent->d_name.name,
-                file->f_dentry->d_name.name);
+                file->f_path.dentry->d_name.name);
 
         /*
          * Directory timestamps in the core protocol aren't updated
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index 50784d13c87b..e50533a79517 100644
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -102,7 +102,7 @@ static int
 smb_readpage(struct file *file, struct page *page)
 {
         int             error;
-        struct dentry  *dentry = file->f_dentry;
+        struct dentry  *dentry = file->f_path.dentry;
 
         page_cache_get(page);
         error = smb_readpage_sync(dentry, page);
@@ -205,7 +205,7 @@ static int
 smb_updatepage(struct file *file, struct page *page, unsigned long offset,
                unsigned int count)
 {
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
 
         DEBUG1("(%s/%s %d@%lld)\n", DENTRY_PATH(dentry), count,
                 ((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset);
@@ -218,7 +218,7 @@ smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         unsigned long nr_segs, loff_t pos)
 {
         struct file * file = iocb->ki_filp;
-        struct dentry * dentry = file->f_dentry;
+        struct dentry * dentry = file->f_path.dentry;
         ssize_t status;
 
         VERBOSE("file %s/%s, count=%lu@%lu\n", DENTRY_PATH(dentry),
@@ -243,7 +243,7 @@ out:
 static int
 smb_file_mmap(struct file * file, struct vm_area_struct * vma)
 {
-        struct dentry * dentry = file->f_dentry;
+        struct dentry * dentry = file->f_path.dentry;
         int     status;
 
         VERBOSE("file %s/%s, address %lu - %lu\n",
@@ -264,7 +264,7 @@ static ssize_t
 smb_file_sendfile(struct file *file, loff_t *ppos,
                   size_t count, read_actor_t actor, void *target)
 {
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
         ssize_t status;
 
         VERBOSE("file %s/%s, pos=%Ld, count=%d\n",
@@ -323,7 +323,7 @@ smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                                unsigned long nr_segs, loff_t pos)
 {
         struct file * file = iocb->ki_filp;
-        struct dentry * dentry = file->f_dentry;
+        struct dentry * dentry = file->f_path.dentry;
         ssize_t result;
 
         VERBOSE("file %s/%s, count=%lu@%lu\n",
@@ -355,7 +355,7 @@ static int
 smb_file_open(struct inode *inode, struct file * file)
 {
         int result;
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
         int smb_mode = (file->f_mode & O_ACCMODE) - 1;
 
         lock_kernel();
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 4af4cd729a5a..84dfe3f3482e 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -482,12 +482,13 @@ smb_put_super(struct super_block *sb)
         smb_close_socket(server);
 
         if (server->conn_pid)
-                kill_proc(server->conn_pid, SIGTERM, 1);
+                kill_pid(server->conn_pid, SIGTERM, 1);
 
         kfree(server->ops);
         smb_unload_nls(server);
         sb->s_fs_info = NULL;
         smb_unlock_server(server);
+        put_pid(server->conn_pid);
         kfree(server);
 }
 
@@ -530,7 +531,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
         INIT_LIST_HEAD(&server->xmitq);
         INIT_LIST_HEAD(&server->recvq);
         server->conn_error = 0;
-        server->conn_pid = 0;
+        server->conn_pid = NULL;
         server->state = CONN_INVALID; /* no connection yet */
         server->generation = 0;
 
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 40e174db9872..feac46050619 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -873,11 +873,11 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
         filp = fget(opt->fd);
         if (!filp)
                 goto out;
-        if (!smb_valid_socket(filp->f_dentry->d_inode))
+        if (!smb_valid_socket(filp->f_path.dentry->d_inode))
                 goto out_putf;
 
         server->sock_file = filp;
-        server->conn_pid = current->pid;
+        server->conn_pid = get_pid(task_pid(current));
         server->opt = *opt;
         server->generation += 1;
         server->state = CONN_VALID;
@@ -898,7 +898,7 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
         /*
          * Store the server in sock user_data (Only used by sunrpc)
          */
-        sk = SOCKET_I(filp->f_dentry->d_inode)->sk;
+        sk = SOCKET_I(filp->f_path.dentry->d_inode)->sk;
         sk->sk_user_data = server;
 
         /* chain into the data_ready callback */
@@ -971,8 +971,8 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
         }
 
         VERBOSE("protocol=%d, max_xmit=%d, pid=%d capabilities=0x%x\n",
-                server->opt.protocol, server->opt.max_xmit, server->conn_pid,
-                server->opt.capabilities);
+                server->opt.protocol, server->opt.max_xmit,
+                pid_nr(server->conn_pid), server->opt.capabilities);
 
         /* FIXME: this really should be done by smbmount. */
         if (server->opt.max_xmit > SMB_MAX_PACKET_SIZE) {
@@ -1939,7 +1939,7 @@ static int
 smb_proc_readdir_short(struct file *filp, void *dirent, filldir_t filldir,
                        struct smb_cache_control *ctl)
 {
-        struct dentry *dir = filp->f_dentry;
+        struct dentry *dir = filp->f_path.dentry;
         struct smb_sb_info *server = server_from_dentry(dir);
         struct qstr qname;
         struct smb_fattr fattr;
@@ -2291,7 +2291,7 @@ static int
 smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
                       struct smb_cache_control *ctl)
 {
-        struct dentry *dir = filp->f_dentry;
+        struct dentry *dir = filp->f_path.dentry;
         struct smb_sb_info *server = server_from_dentry(dir);
         struct qstr qname;
         struct smb_fattr fattr;
@@ -2859,7 +2859,7 @@ static int
 smb_proc_readdir_null(struct file *filp, void *dirent, filldir_t filldir,
                       struct smb_cache_control *ctl)
 {
-        struct smb_sb_info *server = server_from_dentry(filp->f_dentry);
+        struct smb_sb_info *server = server_from_dentry(filp->f_path.dentry);
 
         if (smb_proc_ops_wait(server) < 0)
                 return -EIO;
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index e67540441288..89eaf31f1d46 100644
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -152,7 +152,7 @@ int smbiod_retry(struct smb_sb_info *server)
 {
         struct list_head *head;
         struct smb_request *req;
-        pid_t pid = server->conn_pid;
+        struct pid *pid = get_pid(server->conn_pid);
         int result = 0;
 
         VERBOSE("state: %d\n", server->state);
@@ -222,7 +222,7 @@ int smbiod_retry(struct smb_sb_info *server)
         /*
          * Note: use the "priv" flag, as a user process may need to reconnect.
          */
-        result = kill_proc(pid, SIGUSR1, 1);
+        result = kill_pid(pid, SIGUSR1, 1);
         if (result) {
                 /* FIXME: this is most likely fatal, umount? */
                 printk(KERN_ERR "smb_retry: signal failed [%d]\n", result);
@@ -233,6 +233,7 @@ int smbiod_retry(struct smb_sb_info *server)
         /* FIXME: The retried requests should perhaps get a "time boost". */
 
 out:
+        put_pid(pid);
         return result;
 }
 
diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index 6815b1b12b68..92ea6b2367d7 100644
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -82,10 +82,10 @@ server_sock(struct smb_sb_info *server)
         if (server && (file = server->sock_file))
         {
 #ifdef SMBFS_PARANOIA
-                if (!smb_valid_socket(file->f_dentry->d_inode))
+                if (!smb_valid_socket(file->f_path.dentry->d_inode))
                         PARANOIA("bad socket!\n");
 #endif
-                return SOCKET_I(file->f_dentry->d_inode);
+                return SOCKET_I(file->f_path.dentry->d_inode);
         }
         return NULL;
 }