[RFC,05/27] introduce FMODE_OPENED

Message ID	20180709045417.13988-5-viro@ZenIV.linux.org.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@kernel.org> From: Al Viro <viro@ZenIV.linux.org.uk> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC][PATCH 05/27] introduce FMODE_OPENED Date: Mon, 9 Jul 2018 05:53:55 +0100 Message-Id: <20180709045417.13988-5-viro@ZenIV.linux.org.uk> In-Reply-To: <20180709045417.13988-1-viro@ZenIV.linux.org.uk> References: <20180709045320.GF30522@ZenIV.linux.org.uk> <20180709045417.13988-1-viro@ZenIV.linux.org.uk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 3b38c717008a..017c568bb8a4 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -2684,6 +2684,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg * initialize soft PMU state */ pfm_reset_pmu_state(ctx); + filp->f_mode |= FMODE_OPENED; fd_install(fd, filp); diff --git a/drivers/misc/cxl/api.c b/drivers/misc/cxl/api.c index 6b16946f9b05..146a12fe6cb8 100644 --- a/drivers/misc/cxl/api.c +++ b/drivers/misc/cxl/api.c @@ -102,7 +102,7 @@ static struct file *cxl_getfile(const char *name, path.mnt = mntget(cxl_vfs_mount); d_instantiate(path.dentry, inode); - file = alloc_file(&path, OPEN_FMODE(flags), fops); + file = alloc_file(&path, OPEN_FMODE(flags) | FMODE_OPENED, fops); if (IS_ERR(file)) { path_put(&path); goto err_fs; diff --git a/fs/aio.c b/fs/aio.c index e1d20124ec0e..4d63e8e4d1b5 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -234,7 +234,8 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages) path.mnt = mntget(aio_mnt); d_instantiate(path.dentry, inode); - file = alloc_file(&path, FMODE_READ | FMODE_WRITE, &aio_ring_fops); + file = alloc_file(&path, FMODE_READ | FMODE_WRITE | FMODE_OPENED, + &aio_ring_fops); if (IS_ERR(file)) { path_put(&path); return file; diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 3168ee4e77f4..bf952939a1d3 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c @@ -102,7 +102,7 @@ struct file *anon_inode_getfile(const char *name, d_instantiate(path.dentry, anon_inode_inode); - file = alloc_file(&path, OPEN_FMODE(flags), fops); + file = alloc_file(&path, OPEN_FMODE(flags) | FMODE_OPENED, fops); if (IS_ERR(file)) goto err_dput; file->f_mapping = anon_inode_inode->i_mapping; diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index d508c7844681..e0b8cc89169c 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1375,7 +1375,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, inode->i_size = size; clear_nlink(inode); - file = alloc_file(&path, FMODE_WRITE | FMODE_READ, + file = alloc_file(&path, FMODE_WRITE | FMODE_READ | FMODE_OPENED, &hugetlbfs_file_operations); if (IS_ERR(file)) goto out_dentry; /* inode is already attached */ diff --git a/fs/open.c b/fs/open.c index 40658ef912d2..aec2686130b1 100644 --- a/fs/open.c +++ b/fs/open.c @@ -753,7 +753,7 @@ static int do_dentry_open(struct file *f, f->f_wb_err = filemap_sample_wb_err(f->f_mapping); if (unlikely(f->f_flags & O_PATH)) { - f->f_mode = FMODE_PATH; + f->f_mode = FMODE_PATH | FMODE_OPENED; f->f_op = &empty_fops; return 0; } @@ -795,6 +795,7 @@ static int do_dentry_open(struct file *f, if (error) goto cleanup_all; } + f->f_mode |= FMODE_OPENED; if ((f->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) i_readcount_inc(inode); if ((f->f_mode & FMODE_READ) && diff --git a/fs/pipe.c b/fs/pipe.c index bb0840e234f3..4d62c935f675 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -775,6 +775,8 @@ int create_pipe_files(struct file **res, int flags) goto err_file; } + res[0]->f_mode |= FMODE_OPENED; + f->f_mode |= FMODE_OPENED; path_get(&path); res[0]->private_data = inode->i_pipe; res[0]->f_flags = O_RDONLY | (flags & O_NONBLOCK); diff --git a/include/linux/fs.h b/include/linux/fs.h index aa9b4c169ed2..d1ce90634d8b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -148,12 +148,15 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* Has write method(s) */ #define FMODE_CAN_WRITE ((__force fmode_t)0x40000) +#define FMODE_OPENED ((__force fmode_t)0x80000) + /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x4000000) /* File is capable of returning -EAGAIN if I/O will block */ #define FMODE_NOWAIT ((__force fmode_t)0x8000000) + /* * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector * that indicates that they should check the contents of the iovec are diff --git a/ipc/shm.c b/ipc/shm.c index 051a3e1fb8df..e37931121070 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1449,7 +1449,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, goto out_nattch; } - file = alloc_file(&path, f_mode, + file = alloc_file(&path, f_mode | FMODE_OPENED, is_file_hugepages(shp->shm_file) ? &shm_file_operations_huge : &shm_file_operations); diff --git a/mm/shmem.c b/mm/shmem.c index 2cab84403055..a76adc3802d1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3942,7 +3942,7 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l if (IS_ERR(res)) goto put_path; - res = alloc_file(&path, FMODE_WRITE | FMODE_READ, + res = alloc_file(&path, FMODE_WRITE | FMODE_READ | FMODE_OPENED, &shmem_file_operations); if (IS_ERR(res)) goto put_path; diff --git a/net/socket.c b/net/socket.c index 8a109012608a..eff9db5fd99f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -411,7 +411,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname) d_instantiate(path.dentry, SOCK_INODE(sock)); - file = alloc_file(&path, FMODE_READ | FMODE_WRITE, + file = alloc_file(&path, FMODE_READ | FMODE_WRITE | FMODE_OPENED, &socket_file_ops); if (IS_ERR(file)) { /* drop dentry, keep inode for a bit */

[RFC,05/27] introduce FMODE_OPENED

Commit Message

Patch