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/autofs/root.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/autofs/root.c')
| -rw-r--r-- | fs/autofs/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c index 870e2cf33016..9cac08d6a873 100644 --- a/fs/autofs/root.c +++ b/fs/autofs/root.c | |||
| @@ -26,7 +26,7 @@ static int autofs_root_rmdir(struct inode *,struct dentry *); | |||
| 26 | static int autofs_root_mkdir(struct inode *,struct dentry *,int); | 26 | static int autofs_root_mkdir(struct inode *,struct dentry *,int); |
| 27 | static int autofs_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long); | 27 | static int autofs_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long); |
| 28 | 28 | ||
| 29 | struct file_operations autofs_root_operations = { | 29 | const struct file_operations autofs_root_operations = { |
| 30 | .read = generic_read_dir, | 30 | .read = generic_read_dir, |
| 31 | .readdir = autofs_root_readdir, | 31 | .readdir = autofs_root_readdir, |
| 32 | .ioctl = autofs_root_ioctl, | 32 | .ioctl = autofs_root_ioctl, |