git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI Hotplug: cpqphp_ctrl.c: kmalloc + memset conversion to kzalloc
[safe/jmp/linux-2.6]
/
fs
/
reiserfs
/
ioctl.c
diff --git
a/fs/reiserfs/ioctl.c
b/fs/reiserfs/ioctl.c
index
b484d29
..
11a0fcc
100644
(file)
--- a/
fs/reiserfs/ioctl.c
+++ b/
fs/reiserfs/ioctl.c
@@
-51,8
+51,7
@@
int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
if (IS_RDONLY(inode))
return -EROFS;
if (IS_RDONLY(inode))
return -EROFS;
- if ((current->fsuid != inode->i_uid)
- && !capable(CAP_FOWNER))
+ if (!is_owner_or_cap(inode))
return -EPERM;
if (get_user(flags, (int __user *)arg))
return -EPERM;
if (get_user(flags, (int __user *)arg))
@@
-81,7
+80,7
@@
int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
case REISERFS_IOC_GETVERSION:
return put_user(inode->i_generation, (int __user *)arg);
case REISERFS_IOC_SETVERSION:
case REISERFS_IOC_GETVERSION:
return put_user(inode->i_generation, (int __user *)arg);
case REISERFS_IOC_SETVERSION:
- if (
(current->fsuid != inode->i_uid) && !capable(CAP_FOWNER
))
+ if (
!is_owner_or_cap(inode
))
return -EPERM;
if (IS_RDONLY(inode))
return -EROFS;
return -EPERM;
if (IS_RDONLY(inode))
return -EROFS;