aboutsummaryrefslogtreecommitdiffstats
path: root/fs/smbfs/proc.c
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:39 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:49 -0500
commit17b75e69493f655a09908045eddbb48718aef5de (patch)
treee38bd5c7dfea2027f81ea7a784ee2003bcb9c47c /fs/smbfs/proc.c
parentc943c4b49c75f3cae89e5d993ce1ae859395caa2 (diff)
[PATCH] struct path: convert smbfs
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/smbfs/proc.c')
-rw-r--r--fs/smbfs/proc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 40e174db9872..a5ced9e0c6c4 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -873,7 +873,7 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
873 filp = fget(opt->fd); 873 filp = fget(opt->fd);
874 if (!filp) 874 if (!filp)
875 goto out; 875 goto out;
876 if (!smb_valid_socket(filp->f_dentry->d_inode)) 876 if (!smb_valid_socket(filp->f_path.dentry->d_inode))
877 goto out_putf; 877 goto out_putf;
878 878
879 server->sock_file = filp; 879 server->sock_file = filp;
@@ -898,7 +898,7 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
898 /* 898 /*
899 * Store the server in sock user_data (Only used by sunrpc) 899 * Store the server in sock user_data (Only used by sunrpc)
900 */ 900 */
901 sk = SOCKET_I(filp->f_dentry->d_inode)->sk; 901 sk = SOCKET_I(filp->f_path.dentry->d_inode)->sk;
902 sk->sk_user_data = server; 902 sk->sk_user_data = server;
903 903
904 /* chain into the data_ready callback */ 904 /* chain into the data_ready callback */
@@ -1939,7 +1939,7 @@ static int
1939smb_proc_readdir_short(struct file *filp, void *dirent, filldir_t filldir, 1939smb_proc_readdir_short(struct file *filp, void *dirent, filldir_t filldir,
1940 struct smb_cache_control *ctl) 1940 struct smb_cache_control *ctl)
1941{ 1941{
1942 struct dentry *dir = filp->f_dentry; 1942 struct dentry *dir = filp->f_path.dentry;
1943 struct smb_sb_info *server = server_from_dentry(dir); 1943 struct smb_sb_info *server = server_from_dentry(dir);
1944 struct qstr qname; 1944 struct qstr qname;
1945 struct smb_fattr fattr; 1945 struct smb_fattr fattr;
@@ -2291,7 +2291,7 @@ static int
2291smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir, 2291smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
2292 struct smb_cache_control *ctl) 2292 struct smb_cache_control *ctl)
2293{ 2293{
2294 struct dentry *dir = filp->f_dentry; 2294 struct dentry *dir = filp->f_path.dentry;
2295 struct smb_sb_info *server = server_from_dentry(dir); 2295 struct smb_sb_info *server = server_from_dentry(dir);
2296 struct qstr qname; 2296 struct qstr qname;
2297 struct smb_fattr fattr; 2297 struct smb_fattr fattr;
@@ -2859,7 +2859,7 @@ static int
2859smb_proc_readdir_null(struct file *filp, void *dirent, filldir_t filldir, 2859smb_proc_readdir_null(struct file *filp, void *dirent, filldir_t filldir,
2860 struct smb_cache_control *ctl) 2860 struct smb_cache_control *ctl)
2861{ 2861{
2862 struct smb_sb_info *server = server_from_dentry(filp->f_dentry); 2862 struct smb_sb_info *server = server_from_dentry(filp->f_path.dentry);
2863 2863
2864 if (smb_proc_ops_wait(server) < 0) 2864 if (smb_proc_ops_wait(server) < 0)
2865 return -EIO; 2865 return -EIO;