mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-27 09:02:06 +00:00
[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>
This commit is contained in:
parent
c943c4b49c
commit
17b75e6949
5 changed files with 18 additions and 18 deletions
|
@ -873,7 +873,7 @@ 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;
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue