diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 13:02:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 13:02:16 +1100 |
| commit | a448c9a8528b6c27c9e8f4d341b264330c37c45b (patch) | |
| tree | ae9967dab0b3724c5fc23c10a4686913845c49d2 /fs/open.c | |
| parent | 0379192d9d7c15021c8a85de948c6b8622015c6f (diff) | |
| parent | 8362d43dcdcc68cb7b8337930015b05caad31b34 (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
fs/afs/write.c
fs/cifs/dir.c
fs/ubifs/file.c
include/asm-generic/fcntl.h
net/compat.c
net/socket.c
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/open.c b/fs/open.c index b4b31d277f3a..358f4b57eaf9 100644 --- a/fs/open.c +++ b/fs/open.c @@ -825,9 +825,10 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, struct inode *inode; int error; - f->f_flags = flags; - f->f_mode = (__force fmode_t)((flags+1) & O_ACCMODE) | FMODE_LSEEK | - FMODE_PREAD | FMODE_PWRITE; + f->f_flags = (flags & ~(FMODE_EXEC | FMODE_NONOTIFY)); + f->f_mode = (__force fmode_t)((flags+1) & O_ACCMODE) | (flags & FMODE_NONOTIFY) | + FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE; + inode = dentry->d_inode; if (f->f_mode & FMODE_WRITE) { error = __get_file_write_access(inode, mnt); @@ -1054,7 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode) put_unused_fd(fd); fd = PTR_ERR(f); } else { - fsnotify_open(f->f_path.dentry); + fsnotify_open(f); fd_install(fd, f); } } |