Commit b5c7d208 authored by Al Viro's avatar Al Viro

convert smbfs

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 43d344d7
...@@ -403,12 +403,6 @@ smb_delete_dentry(const struct dentry *dentry) ...@@ -403,12 +403,6 @@ smb_delete_dentry(const struct dentry *dentry)
void void
smb_new_dentry(struct dentry *dentry) smb_new_dentry(struct dentry *dentry)
{ {
struct smb_sb_info *server = server_from_dentry(dentry);
if (server->mnt->flags & SMB_MOUNT_CASE)
d_set_d_op(dentry, &smbfs_dentry_operations_case);
else
d_set_d_op(dentry, &smbfs_dentry_operations);
dentry->d_time = jiffies; dentry->d_time = jiffies;
} }
...@@ -440,7 +434,6 @@ smb_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) ...@@ -440,7 +434,6 @@ smb_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
struct smb_fattr finfo; struct smb_fattr finfo;
struct inode *inode; struct inode *inode;
int error; int error;
struct smb_sb_info *server;
error = -ENAMETOOLONG; error = -ENAMETOOLONG;
if (dentry->d_name.len > SMB_MAXNAMELEN) if (dentry->d_name.len > SMB_MAXNAMELEN)
...@@ -468,12 +461,6 @@ smb_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) ...@@ -468,12 +461,6 @@ smb_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
inode = smb_iget(dir->i_sb, &finfo); inode = smb_iget(dir->i_sb, &finfo);
if (inode) { if (inode) {
add_entry: add_entry:
server = server_from_dentry(dentry);
if (server->mnt->flags & SMB_MOUNT_CASE)
d_set_d_op(dentry, &smbfs_dentry_operations_case);
else
d_set_d_op(dentry, &smbfs_dentry_operations);
d_add(dentry, inode); d_add(dentry, inode);
smb_renew_times(dentry); smb_renew_times(dentry);
error = 0; error = 0;
......
...@@ -614,6 +614,10 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) ...@@ -614,6 +614,10 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
printk(KERN_ERR "smbfs: failed to start smbiod\n"); printk(KERN_ERR "smbfs: failed to start smbiod\n");
goto out_no_smbiod; goto out_no_smbiod;
} }
if (server->mnt->flags & SMB_MOUNT_CASE)
sb->s_d_op = &smbfs_dentry_operations_case;
else
sb->s_d_op = &smbfs_dentry_operations;
/* /*
* Keep the super block locked while we get the root inode. * Keep the super block locked while we get the root inode.
......
...@@ -38,6 +38,8 @@ extern void smb_install_null_ops(struct smb_ops *ops); ...@@ -38,6 +38,8 @@ extern void smb_install_null_ops(struct smb_ops *ops);
extern const struct file_operations smb_dir_operations; extern const struct file_operations smb_dir_operations;
extern const struct inode_operations smb_dir_inode_operations; extern const struct inode_operations smb_dir_inode_operations;
extern const struct inode_operations smb_dir_inode_operations_unix; extern const struct inode_operations smb_dir_inode_operations_unix;
extern const struct dentry_operations smbfs_dentry_operations_case;
extern const struct dentry_operations smbfs_dentry_operations;
extern void smb_new_dentry(struct dentry *dentry); extern void smb_new_dentry(struct dentry *dentry);
extern void smb_renew_times(struct dentry *dentry); extern void smb_renew_times(struct dentry *dentry);
/* cache.c */ /* cache.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment