diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /include/linux/security.h | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 47e82c120f9a..9eb9e0fe0331 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -322,7 +322,7 @@ struct request_sock; | |||
| 322 | * @dir contains the inode structure of parent of the new file. | 322 | * @dir contains the inode structure of parent of the new file. |
| 323 | * @dentry contains the dentry structure of the new file. | 323 | * @dentry contains the dentry structure of the new file. |
| 324 | * @mode contains the mode of the new file. | 324 | * @mode contains the mode of the new file. |
| 325 | * @dev contains the the device number. | 325 | * @dev contains the device number. |
| 326 | * Return 0 if permission is granted. | 326 | * Return 0 if permission is granted. |
| 327 | * @inode_rename: | 327 | * @inode_rename: |
| 328 | * Check for permission to rename a file or directory. | 328 | * Check for permission to rename a file or directory. |