git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus
[pandora-kernel.git]
/
fs
/
exportfs
/
expfs.c
diff --git
a/fs/exportfs/expfs.c
b/fs/exportfs/expfs.c
index
890e018
..
197c7db
100644
(file)
--- a/
fs/exportfs/expfs.c
+++ b/
fs/exportfs/expfs.c
@@
-14,6
+14,7
@@
#include <linux/module.h>
#include <linux/mount.h>
#include <linux/namei.h>
#include <linux/module.h>
#include <linux/mount.h>
#include <linux/namei.h>
+#include <linux/sched.h>
#define dprintk(fmt, args...) do{}while(0)
#define dprintk(fmt, args...) do{}while(0)
@@
-249,6
+250,7
@@
static int filldir_one(void * __buf, const char * name, int len,
static int get_name(struct vfsmount *mnt, struct dentry *dentry,
char *name, struct dentry *child)
{
static int get_name(struct vfsmount *mnt, struct dentry *dentry,
char *name, struct dentry *child)
{
+ const struct cred *cred = current_cred();
struct inode *dir = dentry->d_inode;
int error;
struct file *file;
struct inode *dir = dentry->d_inode;
int error;
struct file *file;
@@
-263,7
+265,7
@@
static int get_name(struct vfsmount *mnt, struct dentry *dentry,
/*
* Open the directory ...
*/
/*
* Open the directory ...
*/
- file = dentry_open(dget(dentry), mntget(mnt), O_RDONLY);
+ file = dentry_open(dget(dentry), mntget(mnt), O_RDONLY
, cred
);
error = PTR_ERR(file);
if (IS_ERR(file))
goto out;
error = PTR_ERR(file);
if (IS_ERR(file))
goto out;