git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
udf
/
file.c
diff --git
a/fs/udf/file.c
b/fs/udf/file.c
index
bb40d63
..
e34b00e
100644
(file)
--- a/
fs/udf/file.c
+++ b/
fs/udf/file.c
@@
-4,11
+4,6
@@
* PURPOSE
* File handling routines for the OSTA-UDF(tm) filesystem.
*
* PURPOSE
* File handling routines for the OSTA-UDF(tm) filesystem.
*
- * CONTACTS
- * E-mail regarding any portion of the Linux UDF file system should be
- * directed to the development team mailing list (run by majordomo):
- * linux_udf@hpesjro.fc.hp.com
- *
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
* COPYRIGHT
* This file is distributed under the terms of the GNU General Public
* License (GPL). Copies of the GPL can be obtained from:
@@
-36,6
+31,7
@@
#include <asm/uaccess.h>
#include <linux/kernel.h>
#include <linux/string.h> /* memset */
#include <asm/uaccess.h>
#include <linux/kernel.h>
#include <linux/string.h> /* memset */
+#include <linux/capability.h>
#include <linux/errno.h>
#include <linux/smp_lock.h>
#include <linux/pagemap.h>
#include <linux/errno.h>
#include <linux/smp_lock.h>
#include <linux/pagemap.h>
@@
-186,7
+182,7
@@
int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
{
int result = -EINVAL;
{
int result = -EINVAL;
- if (
permission(inode, MAY_READ, NULL
) != 0 )
+ if (
file_permission(filp, MAY_READ
) != 0 )
{
udf_debug("no permission to access inode %lu\n",
inode->i_ino);
{
udf_debug("no permission to access inode %lu\n",
inode->i_ino);
@@
-252,7
+248,7
@@
static int udf_release_file(struct inode * inode, struct file * filp)
return 0;
}
return 0;
}
-struct file_operations udf_file_operations = {
+
const
struct file_operations udf_file_operations = {
.read = generic_file_read,
.ioctl = udf_ioctl,
.open = generic_file_open,
.read = generic_file_read,
.ioctl = udf_ioctl,
.open = generic_file_open,