projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index
6c82e5b
..
22764c7
100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-159,7
+159,7
@@
static int setfl(int fd, struct file * filp, unsigned long arg)
/* O_NOATIME can only be set by the owner or superuser */
if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
- if (!i
s_owner_or_cap
(inode))
+ if (!i
node_owner_or_capable
(inode))
return -EPERM;
/* required for strict SunOS emulation */