diff options
author | James Morris <jmorris@namei.org> | 2009-02-05 19:01:45 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-02-05 19:01:45 -0500 |
commit | cb5629b10d64a8006622ce3a52bc887d91057d69 (patch) | |
tree | 7c06d8f30783115e3384721046258ce615b129c5 /Documentation/usb/dma.txt | |
parent | 8920d5ad6ba74ae8ab020e90cc4d976980e68701 (diff) | |
parent | f01d1d546abb2f4028b5299092f529eefb01253a (diff) |
Merge branch 'master' into next
Conflicts:
fs/namei.c
Manually merged per:
diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;
@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}
- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
- error = ima_path_check(&nd->path,
++ error = ima_path_check(path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'Documentation/usb/dma.txt')
-rw-r--r-- | Documentation/usb/dma.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/usb/dma.txt b/Documentation/usb/dma.txt index e8b50b7de9d9..cfdcd16e3abf 100644 --- a/Documentation/usb/dma.txt +++ b/Documentation/usb/dma.txt | |||
@@ -6,8 +6,9 @@ in the kernel usb programming guide (kerneldoc, from the source code). | |||
6 | API OVERVIEW | 6 | API OVERVIEW |
7 | 7 | ||
8 | The big picture is that USB drivers can continue to ignore most DMA issues, | 8 | The big picture is that USB drivers can continue to ignore most DMA issues, |
9 | though they still must provide DMA-ready buffers (see DMA-mapping.txt). | 9 | though they still must provide DMA-ready buffers (see |
10 | That's how they've worked through the 2.4 (and earlier) kernels. | 10 | Documentation/PCI/PCI-DMA-mapping.txt). That's how they've worked through |
11 | the 2.4 (and earlier) kernels. | ||
11 | 12 | ||
12 | OR: they can now be DMA-aware. | 13 | OR: they can now be DMA-aware. |
13 | 14 | ||
@@ -62,8 +63,8 @@ and effects like cache-trashing can impose subtle penalties. | |||
62 | force a consistent memory access ordering by using memory barriers. It's | 63 | force a consistent memory access ordering by using memory barriers. It's |
63 | not using a streaming DMA mapping, so it's good for small transfers on | 64 | not using a streaming DMA mapping, so it's good for small transfers on |
64 | systems where the I/O would otherwise thrash an IOMMU mapping. (See | 65 | systems where the I/O would otherwise thrash an IOMMU mapping. (See |
65 | Documentation/DMA-mapping.txt for definitions of "coherent" and "streaming" | 66 | Documentation/PCI/PCI-DMA-mapping.txt for definitions of "coherent" and |
66 | DMA mappings.) | 67 | "streaming" DMA mappings.) |
67 | 68 | ||
68 | Asking for 1/Nth of a page (as well as asking for N pages) is reasonably | 69 | Asking for 1/Nth of a page (as well as asking for N pages) is reasonably |
69 | space-efficient. | 70 | space-efficient. |
@@ -93,7 +94,7 @@ WORKING WITH EXISTING BUFFERS | |||
93 | Existing buffers aren't usable for DMA without first being mapped into the | 94 | Existing buffers aren't usable for DMA without first being mapped into the |
94 | DMA address space of the device. However, most buffers passed to your | 95 | DMA address space of the device. However, most buffers passed to your |
95 | driver can safely be used with such DMA mapping. (See the first section | 96 | driver can safely be used with such DMA mapping. (See the first section |
96 | of DMA-mapping.txt, titled "What memory is DMA-able?") | 97 | of Documentation/PCI/PCI-DMA-mapping.txt, titled "What memory is DMA-able?") |
97 | 98 | ||
98 | - When you're using scatterlists, you can map everything at once. On some | 99 | - When you're using scatterlists, you can map everything at once. On some |
99 | systems, this kicks in an IOMMU and turns the scatterlists into single | 100 | systems, this kicks in an IOMMU and turns the scatterlists into single |