Commit d1cd8c07 authored by Urban Widmark's avatar Urban Widmark Committed by Linus Torvalds

[PATCH] smbfs - C99 stuff

Art Haas did these.
parent 74e8b5f4
......@@ -33,22 +33,22 @@ static int smb_rename(struct inode *, struct dentry *,
struct file_operations smb_dir_operations =
{
read: generic_read_dir,
readdir: smb_readdir,
ioctl: smb_ioctl,
open: smb_dir_open,
.read = generic_read_dir,
.readdir = smb_readdir,
.ioctl = smb_ioctl,
.open = smb_dir_open,
};
struct inode_operations smb_dir_inode_operations =
{
create: smb_create,
lookup: smb_lookup,
unlink: smb_unlink,
mkdir: smb_mkdir,
rmdir: smb_rmdir,
rename: smb_rename,
getattr: smb_getattr,
setattr: smb_notify_change,
.create = smb_create,
.lookup = smb_lookup,
.unlink = smb_unlink,
.mkdir = smb_mkdir,
.rmdir = smb_rmdir,
.rename = smb_rename,
.getattr = smb_getattr,
.setattr = smb_notify_change,
};
/*
......@@ -257,16 +257,16 @@ static int smb_delete_dentry(struct dentry *);
static struct dentry_operations smbfs_dentry_operations =
{
d_revalidate: smb_lookup_validate,
d_hash: smb_hash_dentry,
d_compare: smb_compare_dentry,
d_delete: smb_delete_dentry,
.d_revalidate = smb_lookup_validate,
.d_hash = smb_hash_dentry,
.d_compare = smb_compare_dentry,
.d_delete = smb_delete_dentry,
};
static struct dentry_operations smbfs_dentry_operations_case =
{
d_revalidate: smb_lookup_validate,
d_delete: smb_delete_dentry,
.d_revalidate = smb_lookup_validate,
.d_delete = smb_delete_dentry,
};
......
......@@ -287,10 +287,10 @@ static int smb_commit_write(struct file *file, struct page *page,
}
struct address_space_operations smb_file_aops = {
readpage: smb_readpage,
writepage: smb_writepage,
prepare_write: smb_prepare_write,
commit_write: smb_commit_write
.readpage = smb_readpage,
.writepage = smb_writepage,
.prepare_write = smb_prepare_write,
.commit_write = smb_commit_write
};
/*
......@@ -382,19 +382,19 @@ smb_file_permission(struct inode *inode, int mask)
struct file_operations smb_file_operations =
{
llseek: remote_llseek,
read: smb_file_read,
write: smb_file_write,
ioctl: smb_ioctl,
mmap: smb_file_mmap,
open: smb_file_open,
release: smb_file_release,
fsync: smb_fsync,
.llseek = remote_llseek,
.read = smb_file_read,
.write = smb_file_write,
.ioctl = smb_ioctl,
.mmap = smb_file_mmap,
.open = smb_file_open,
.release = smb_file_release,
.fsync = smb_fsync,
};
struct inode_operations smb_file_inode_operations =
{
permission: smb_file_permission,
getattr: smb_getattr,
setattr: smb_notify_change,
.permission = smb_file_permission,
.getattr = smb_getattr,
.setattr = smb_notify_change,
};
......@@ -92,13 +92,13 @@ static void destroy_inodecache(void)
static struct super_operations smb_sops =
{
alloc_inode: smb_alloc_inode,
destroy_inode: smb_destroy_inode,
drop_inode: generic_delete_inode,
delete_inode: smb_delete_inode,
put_super: smb_put_super,
statfs: smb_statfs,
show_options: smb_show_options,
.alloc_inode = smb_alloc_inode,
.destroy_inode = smb_destroy_inode,
.drop_inode = generic_delete_inode,
.delete_inode = smb_delete_inode,
.put_super = smb_put_super,
.statfs = smb_statfs,
.show_options = smb_show_options,
};
......@@ -738,10 +738,10 @@ static struct super_block *smb_get_sb(struct file_system_type *fs_type,
}
static struct file_system_type smb_fs_type = {
owner: THIS_MODULE,
name: "smbfs",
get_sb: smb_get_sb,
kill_sb: kill_anon_super,
.owner = THIS_MODULE,
.name = "smbfs",
.get_sb = smb_get_sb,
.kill_sb = kill_anon_super,
};
static int __init init_smb_fs(void)
......
......@@ -1882,8 +1882,8 @@ smb_proc_readdir_short(struct file *filp, void *dirent, filldir_t filldir,
__u16 count;
char status[SMB_STATUS_SIZE];
static struct qstr mask = {
name: "*.*",
len: 3,
.name = "*.*",
.len = 3,
};
unsigned char *last_status;
struct smb_request *req;
......@@ -2159,8 +2159,8 @@ smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir,
struct smb_request *req;
unsigned char *name_buf;
static struct qstr star = {
name: "*",
len: 1,
.name = "*",
.len = 1,
};
lock_kernel();
......@@ -2917,39 +2917,39 @@ install_ops(struct smb_ops *dst, struct smb_ops *src)
/* < LANMAN2 */
static struct smb_ops smb_ops_core =
{
read: smb_proc_read,
write: smb_proc_write,
readdir: smb_proc_readdir_short,
getattr: smb_proc_getattr_core,
truncate: smb_proc_trunc32,
.read = smb_proc_read,
.write = smb_proc_write,
.readdir = smb_proc_readdir_short,
.getattr = smb_proc_getattr_core,
.truncate = smb_proc_trunc32,
};
/* LANMAN2, OS/2, others? */
static struct smb_ops smb_ops_os2 =
{
read: smb_proc_read,
write: smb_proc_write,
readdir: smb_proc_readdir_long,
getattr: smb_proc_getattr_trans2_std,
truncate: smb_proc_trunc32,
.read = smb_proc_read,
.write = smb_proc_write,
.readdir = smb_proc_readdir_long,
.getattr = smb_proc_getattr_trans2_std,
.truncate = smb_proc_trunc32,
};
/* Win95, and possibly some NetApp versions too */
static struct smb_ops smb_ops_win95 =
{
read: smb_proc_read, /* does not support 12word readX */
write: smb_proc_write,
readdir: smb_proc_readdir_long,
getattr: smb_proc_getattr_95,
truncate: smb_proc_trunc95,
.read = smb_proc_read, /* does not support 12word readX */
.write = smb_proc_write,
.readdir = smb_proc_readdir_long,
.getattr = smb_proc_getattr_95,
.truncate = smb_proc_trunc95,
};
/* Samba, NT4 and NT5 */
static struct smb_ops smb_ops_winNT =
{
read: smb_proc_readX,
write: smb_proc_writeX,
readdir: smb_proc_readdir_long,
getattr: smb_proc_getattr_trans2_all,
truncate: smb_proc_trunc64,
.read = smb_proc_readX,
.write = smb_proc_writeX,
.readdir = smb_proc_readdir_long,
.getattr = smb_proc_getattr_trans2_all,
.truncate = smb_proc_trunc64,
};
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