diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
| commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
| tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /fs/cifs/cifsproto.h | |
| parent | 0d83ab65ff1b54ce8b6cd172285cf71a38c4cceb (diff) | |
| parent | bfe159a51203c15d23cb3158fffdc25ec4b4dda1 (diff) | |
Merge branch 'scsi-fixes'
Diffstat (limited to 'fs/cifs/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 257f312ede42..8df28e925e5b 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
| @@ -154,9 +154,9 @@ extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *, | |||
| 154 | extern void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, | 154 | extern void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, |
| 155 | struct cifs_sb_info *cifs_sb); | 155 | struct cifs_sb_info *cifs_sb); |
| 156 | extern int cifs_match_super(struct super_block *, void *); | 156 | extern int cifs_match_super(struct super_block *, void *); |
| 157 | extern void cifs_cleanup_volume_info(struct smb_vol **pvolume_info); | 157 | extern void cifs_cleanup_volume_info(struct smb_vol *pvolume_info); |
| 158 | extern int cifs_setup_volume_info(struct smb_vol **pvolume_info, | 158 | extern struct smb_vol *cifs_get_volume_info(char *mount_data, |
| 159 | char *mount_data, const char *devname); | 159 | const char *devname); |
| 160 | extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); | 160 | extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); |
| 161 | extern void cifs_umount(struct cifs_sb_info *); | 161 | extern void cifs_umount(struct cifs_sb_info *); |
| 162 | extern void cifs_dfs_release_automount_timer(void); | 162 | extern void cifs_dfs_release_automount_timer(void); |