git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
afs
/
mntpt.c
diff --git
a/fs/afs/mntpt.c
b/fs/afs/mntpt.c
index
3a36a3c
..
8b5c1e2
100644
(file)
--- a/
fs/afs/mntpt.c
+++ b/
fs/afs/mntpt.c
@@
-30,10
+30,7
@@
static struct dentry *afs_mntpt_lookup(struct inode *dir,
struct dentry *dentry,
struct nameidata *nd);
static int afs_mntpt_open(struct inode *inode, struct file *file);
struct dentry *dentry,
struct nameidata *nd);
static int afs_mntpt_open(struct inode *inode, struct file *file);
-
-#ifdef AFS_AUTOMOUNT_SUPPORT
static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd);
-#endif
struct file_operations afs_mntpt_file_operations = {
.open = afs_mntpt_open,
struct file_operations afs_mntpt_file_operations = {
.open = afs_mntpt_open,
@@
-41,14
+38,11
@@
struct file_operations afs_mntpt_file_operations = {
struct inode_operations afs_mntpt_inode_operations = {
.lookup = afs_mntpt_lookup,
struct inode_operations afs_mntpt_inode_operations = {
.lookup = afs_mntpt_lookup,
-#ifdef AFS_AUTOMOUNT_SUPPORT
.follow_link = afs_mntpt_follow_link,
.follow_link = afs_mntpt_follow_link,
-#endif
.readlink = page_readlink,
.getattr = afs_inode_getattr,
};
.readlink = page_readlink,
.getattr = afs_inode_getattr,
};
-#ifdef AFS_AUTOMOUNT_SUPPORT
static LIST_HEAD(afs_vfsmounts);
static void afs_mntpt_expiry_timed_out(struct afs_timer *timer);
static LIST_HEAD(afs_vfsmounts);
static void afs_mntpt_expiry_timed_out(struct afs_timer *timer);
@@
-60,7
+54,6
@@
struct afs_timer_ops afs_mntpt_expiry_timer_ops = {
struct afs_timer afs_mntpt_expiry_timer;
unsigned long afs_mntpt_expiry_timeout = 20;
struct afs_timer afs_mntpt_expiry_timer;
unsigned long afs_mntpt_expiry_timeout = 20;
-#endif
/*****************************************************************************/
/*
/*****************************************************************************/
/*
@@
-156,7
+149,6
@@
static int afs_mntpt_open(struct inode *inode, struct file *file)
return -EREMOTE;
} /* end afs_mntpt_open() */
return -EREMOTE;
} /* end afs_mntpt_open() */
-#ifdef AFS_AUTOMOUNT_SUPPORT
/*****************************************************************************/
/*
* create a vfsmount to be automounted
/*****************************************************************************/
/*
* create a vfsmount to be automounted
@@
-168,6
+160,7
@@
static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
struct page *page = NULL;
size_t size;
char *buf, *devname = NULL, *options = NULL;
struct page *page = NULL;
size_t size;
char *buf, *devname = NULL, *options = NULL;
+ filler_t *filler;
int ret;
kenter("{%s}", mntpt->d_name.name);
int ret;
kenter("{%s}", mntpt->d_name.name);
@@
-189,7
+182,7
@@
static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
goto error;
/* read the contents of the AFS special symlink */
goto error;
/* read the contents of the AFS special symlink */
- filler
_t *filler =
mntpt->d_inode->i_mapping->a_ops->readpage;
+ filler
= (filler_t *)
mntpt->d_inode->i_mapping->a_ops->readpage;
page = read_cache_page(mntpt->d_inode->i_mapping, 0, filler, NULL);
if (IS_ERR(page)) {
page = read_cache_page(mntpt->d_inode->i_mapping, 0, filler, NULL);
if (IS_ERR(page)) {
@@
-257,7
+250,7
@@
static int afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
if (IS_ERR(newmnt))
return PTR_ERR(newmnt);
if (IS_ERR(newmnt))
return PTR_ERR(newmnt);
-
struct_cpy(&newnd, nd)
;
+
newnd = *nd
;
newnd.dentry = dentry;
err = do_add_mount(newmnt, &newnd, 0, &afs_vfsmounts);
newnd.dentry = dentry;
err = do_add_mount(newmnt, &newnd, 0, &afs_vfsmounts);
@@
-288,4
+281,3
@@
static void afs_mntpt_expiry_timed_out(struct afs_timer *timer)
kleave("");
} /* end afs_mntpt_expiry_timed_out() */
kleave("");
} /* end afs_mntpt_expiry_timed_out() */
-#endif