diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /fs/smbfs/dir.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/smbfs/dir.c')
-rw-r--r-- | fs/smbfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c index 0424d06b147e..34c7a11d91f0 100644 --- a/fs/smbfs/dir.c +++ b/fs/smbfs/dir.c | |||
@@ -34,7 +34,7 @@ static int smb_rename(struct inode *, struct dentry *, | |||
34 | static int smb_make_node(struct inode *,struct dentry *,int,dev_t); | 34 | static int smb_make_node(struct inode *,struct dentry *,int,dev_t); |
35 | static int smb_link(struct dentry *, struct inode *, struct dentry *); | 35 | static int smb_link(struct dentry *, struct inode *, struct dentry *); |
36 | 36 | ||
37 | struct file_operations smb_dir_operations = | 37 | const struct file_operations smb_dir_operations = |
38 | { | 38 | { |
39 | .read = generic_read_dir, | 39 | .read = generic_read_dir, |
40 | .readdir = smb_readdir, | 40 | .readdir = smb_readdir, |