diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /fs/afs/mntpt.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'fs/afs/mntpt.c')
-rw-r--r-- | fs/afs/mntpt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index 9682c33d5da..aa59184151d 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | static struct dentry *afs_mntpt_lookup(struct inode *dir, | 23 | static struct dentry *afs_mntpt_lookup(struct inode *dir, |
24 | struct dentry *dentry, | 24 | struct dentry *dentry, |
25 | unsigned int flags); | 25 | struct nameidata *nd); |
26 | static int afs_mntpt_open(struct inode *inode, struct file *file); | 26 | static int afs_mntpt_open(struct inode *inode, struct file *file); |
27 | static void afs_mntpt_expiry_timed_out(struct work_struct *work); | 27 | static void afs_mntpt_expiry_timed_out(struct work_struct *work); |
28 | 28 | ||
@@ -104,7 +104,7 @@ out: | |||
104 | */ | 104 | */ |
105 | static struct dentry *afs_mntpt_lookup(struct inode *dir, | 105 | static struct dentry *afs_mntpt_lookup(struct inode *dir, |
106 | struct dentry *dentry, | 106 | struct dentry *dentry, |
107 | unsigned int flags) | 107 | struct nameidata *nd) |
108 | { | 108 | { |
109 | _enter("%p,%p{%p{%s},%s}", | 109 | _enter("%p,%p{%p{%s},%s}", |
110 | dir, | 110 | dir, |
@@ -200,9 +200,9 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) | |||
200 | if (PageError(page)) | 200 | if (PageError(page)) |
201 | goto error; | 201 | goto error; |
202 | 202 | ||
203 | buf = kmap_atomic(page); | 203 | buf = kmap_atomic(page, KM_USER0); |
204 | memcpy(devname, buf, size); | 204 | memcpy(devname, buf, size); |
205 | kunmap_atomic(buf); | 205 | kunmap_atomic(buf, KM_USER0); |
206 | page_cache_release(page); | 206 | page_cache_release(page); |
207 | page = NULL; | 207 | page = NULL; |
208 | } | 208 | } |
@@ -242,7 +242,7 @@ struct vfsmount *afs_d_automount(struct path *path) | |||
242 | { | 242 | { |
243 | struct vfsmount *newmnt; | 243 | struct vfsmount *newmnt; |
244 | 244 | ||
245 | _enter("{%s}", path->dentry->d_name.name); | 245 | _enter("{%s,%s}", path->mnt->mnt_devname, path->dentry->d_name.name); |
246 | 246 | ||
247 | newmnt = afs_mntpt_do_automount(path->dentry); | 247 | newmnt = afs_mntpt_do_automount(path->dentry); |
248 | if (IS_ERR(newmnt)) | 248 | if (IS_ERR(newmnt)) |
@@ -252,7 +252,7 @@ struct vfsmount *afs_d_automount(struct path *path) | |||
252 | mnt_set_expiry(newmnt, &afs_vfsmounts); | 252 | mnt_set_expiry(newmnt, &afs_vfsmounts); |
253 | queue_delayed_work(afs_wq, &afs_mntpt_expiry_timer, | 253 | queue_delayed_work(afs_wq, &afs_mntpt_expiry_timer, |
254 | afs_mntpt_expiry_timeout * HZ); | 254 | afs_mntpt_expiry_timeout * HZ); |
255 | _leave(" = %p", newmnt); | 255 | _leave(" = %p {%s}", newmnt, newmnt->mnt_devname); |
256 | return newmnt; | 256 | return newmnt; |
257 | } | 257 | } |
258 | 258 | ||