projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (6573): unexport flexcop_reset_block_300
[deliverable/linux.git]
/
fs
/
open.c
diff --git
a/fs/open.c
b/fs/open.c
index cdbb94a9efc20ceb3c07c52419b73b124859f7e6..4932b4d1da05f72037b22ec04378edcf83fbc14f 100644
(file)
--- a/
fs/open.c
+++ b/
fs/open.c
@@
-569,7
+569,7
@@
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
dentry = file->f_path.dentry;
inode = dentry->d_inode;
dentry = file->f_path.dentry;
inode = dentry->d_inode;
- audit_inode(NULL,
inode
);
+ audit_inode(NULL,
dentry
);
err = -EROFS;
if (IS_RDONLY(inode))
err = -EROFS;
if (IS_RDONLY(inode))
@@
-658,7
+658,8
@@
static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
newattrs.ia_gid = group;
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_gid = group;
}
if (!S_ISDIR(inode->i_mode))
- newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
+ newattrs.ia_valid |=
+ ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV;
mutex_lock(&inode->i_mutex);
error = notify_change(dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
mutex_lock(&inode->i_mutex);
error = notify_change(dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
@@
-726,7
+727,7
@@
asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group)
goto out;
dentry = file->f_path.dentry;
goto out;
dentry = file->f_path.dentry;
- audit_inode(NULL, dentry
->d_inode
);
+ audit_inode(NULL, dentry);
error = chown_common(dentry, user, group);
fput(file);
out:
error = chown_common(dentry, user, group);
fput(file);
out:
@@
-1060,7
+1061,7
@@
asmlinkage long sys_open(const char __user *filename, int flags, int mode)
prevent_tail_call(ret);
return ret;
}
prevent_tail_call(ret);
return ret;
}
-EXPORT_
SYMBOL_GPL(sys_open);
+EXPORT_
UNUSED_SYMBOL_GPL(sys_open); /* To be deleted for 2.6.25 */
asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
int mode)
asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
int mode)
This page took
0.027681 seconds
and
5
git commands to generate.