aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs/mntpt.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/afs/mntpt.c')
-rw-r--r--fs/afs/mntpt.c27
1 files changed, 10 insertions, 17 deletions
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 68495f0de7b3..ca3fa81b068a 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -1,4 +1,4 @@
1/* mntpt.c: mountpoint management 1/* mountpoint management
2 * 2 *
3 * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. 3 * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com) 4 * Written by David Howells (dhowells@redhat.com)
@@ -54,7 +54,6 @@ struct afs_timer afs_mntpt_expiry_timer;
54 54
55unsigned long afs_mntpt_expiry_timeout = 20; 55unsigned long afs_mntpt_expiry_timeout = 20;
56 56
57/*****************************************************************************/
58/* 57/*
59 * check a symbolic link to see whether it actually encodes a mountpoint 58 * check a symbolic link to see whether it actually encodes a mountpoint
60 * - sets the AFS_VNODE_MOUNTPOINT flag on the vnode appropriately 59 * - sets the AFS_VNODE_MOUNTPOINT flag on the vnode appropriately
@@ -99,16 +98,14 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode)
99 98
100 ret = 0; 99 ret = 0;
101 100
102 out_free: 101out_free:
103 kunmap(page); 102 kunmap(page);
104 page_cache_release(page); 103 page_cache_release(page);
105 out: 104out:
106 _leave(" = %d", ret); 105 _leave(" = %d", ret);
107 return ret; 106 return ret;
107}
108 108
109} /* end afs_mntpt_check_symlink() */
110
111/*****************************************************************************/
112/* 109/*
113 * no valid lookup procedure on this sort of dir 110 * no valid lookup procedure on this sort of dir
114 */ 111 */
@@ -125,9 +122,8 @@ static struct dentry *afs_mntpt_lookup(struct inode *dir,
125 dentry->d_name.name); 122 dentry->d_name.name);
126 123
127 return ERR_PTR(-EREMOTE); 124 return ERR_PTR(-EREMOTE);
128} /* end afs_mntpt_lookup() */ 125}
129 126
130/*****************************************************************************/
131/* 127/*
132 * no valid open procedure on this sort of dir 128 * no valid open procedure on this sort of dir
133 */ 129 */
@@ -142,9 +138,8 @@ static int afs_mntpt_open(struct inode *inode, struct file *file)
142 file->f_path.dentry->d_name.name); 138 file->f_path.dentry->d_name.name);
143 139
144 return -EREMOTE; 140 return -EREMOTE;
145} /* end afs_mntpt_open() */ 141}
146 142
147/*****************************************************************************/
148/* 143/*
149 * create a vfsmount to be automounted 144 * create a vfsmount to be automounted
150 */ 145 */
@@ -210,7 +205,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
210 kleave(" = %p", mnt); 205 kleave(" = %p", mnt);
211 return mnt; 206 return mnt;
212 207
213 error: 208error:
214 if (page) 209 if (page)
215 page_cache_release(page); 210 page_cache_release(page);
216 if (devname) 211 if (devname)
@@ -219,9 +214,8 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
219 free_page((unsigned long) options); 214 free_page((unsigned long) options);
220 kleave(" = %d", ret); 215 kleave(" = %d", ret);
221 return ERR_PTR(ret); 216 return ERR_PTR(ret);
222} /* end afs_mntpt_do_automount() */ 217}
223 218
224/*****************************************************************************/
225/* 219/*
226 * follow a link from a mountpoint directory, thus causing it to be mounted 220 * follow a link from a mountpoint directory, thus causing it to be mounted
227 */ 221 */
@@ -260,9 +254,8 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
260 254
261 kleave(" = %d", err); 255 kleave(" = %d", err);
262 return ERR_PTR(err); 256 return ERR_PTR(err);
263} /* end afs_mntpt_follow_link() */ 257}
264 258
265/*****************************************************************************/
266/* 259/*
267 * handle mountpoint expiry timer going off 260 * handle mountpoint expiry timer going off
268 */ 261 */
@@ -276,4 +269,4 @@ static void afs_mntpt_expiry_timed_out(struct afs_timer *timer)
276 afs_mntpt_expiry_timeout * HZ); 269 afs_mntpt_expiry_timeout * HZ);
277 270
278 kleave(""); 271 kleave("");
279} /* end afs_mntpt_expiry_timed_out() */ 272}