summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
commit739cdbf1d8f0739b80035b80d69d871e33749b86 (patch)
tree15134df8723ab7d7a5524c99070f02d5739bad0d /fs/cifs/cifsfs.h
parent83bbecc905b3431c60fe282830e09aaaab97b26a (diff)
parent8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff)
downloadkernel-crypto-739cdbf1d8f0739b80035b80d69d871e33749b86.tar.gz
kernel-crypto-739cdbf1d8f0739b80035b80d69d871e33749b86.tar.xz
kernel-crypto-739cdbf1d8f0739b80035b80d69d871e33749b86.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/cifs/cifsfs.h')
-rw-r--r--fs/cifs/cifsfs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 78af5850c55..1fd21f66f24 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -83,8 +83,8 @@ extern int cifs_dir_notify(struct file *, unsigned long arg);
extern struct dentry_operations cifs_dentry_ops;
/* Functions related to symlinks */
-extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd);
-extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd);
+extern void *cifs_follow_link(struct dentry *direntry, struct nameidata *nd);
+extern void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *);
extern int cifs_readlink(struct dentry *direntry, char __user *buffer,
int buflen);
extern int cifs_symlink(struct inode *inode, struct dentry *direntry,