Merge branch 'next' into for-linus

This commit is contained in:
James Morris
2008-12-25 11:40:09 +11:00
223 changed files with 5707 additions and 3351 deletions

View File

@@ -161,7 +161,8 @@ void mconsole_proc(struct mc_request *req)
goto out_kill;
}
file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY);
file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY,
current_cred());
if (IS_ERR(file)) {
mconsole_reply(req, "Failed to open file", 1, 0);
goto out_kill;