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

@@ -120,7 +120,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
switch (access) {
case V9FS_ACCESS_SINGLE:
case V9FS_ACCESS_USER:
uid = current->fsuid;
uid = current_fsuid();
any = 0;
break;