Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: jfs: Fix 32bit build warning Remove obsolete comment in fs.h Sanitize f_flags helpers Fix f_flags/f_mode in case of lookup_instantiate_filp() from open(pathname, 3) anonfd: Allow making anon files read-only fs/compat_ioctl.c: fix build error when !BLOCK pohmelfs needs I_LOCK alloc_file(): simplify handling of mnt_clone_write() errors
This commit is contained in:
@@ -250,7 +250,6 @@ struct audit_context {
|
||||
#endif
|
||||
};
|
||||
|
||||
#define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE])
|
||||
static inline int open_arg(int flags, int mask)
|
||||
{
|
||||
int n = ACC_MODE(flags);
|
||||
|
||||
+1
-1
@@ -4724,7 +4724,7 @@ SYSCALL_DEFINE5(perf_event_open,
|
||||
if (IS_ERR(event))
|
||||
goto err_put_context;
|
||||
|
||||
err = anon_inode_getfd("[perf_event]", &perf_fops, event, 0);
|
||||
err = anon_inode_getfd("[perf_event]", &perf_fops, event, O_RDWR);
|
||||
if (err < 0)
|
||||
goto err_free_put_context;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user