Merge branch 'linus' into next

此提交包含在:
James Morris
2011-06-30 18:43:56 +10:00
當前提交 5b944a71a1
共有 813 個檔案被更改,包括 10217 行新增4665 行删除

查看文件

@@ -125,7 +125,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
}
if (need_dev) {
/* Get mount point or device file. */
if (kern_path(dev_name, LOOKUP_FOLLOW, &path)) {
if (!dev_name || kern_path(dev_name, LOOKUP_FOLLOW, &path)) {
error = -ENOENT;
goto out;
}