From aad888f828fec1e7160b67f122172e7ab7f82e03 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 8 Jun 2018 12:58:04 -0400 Subject: switch all remaining checks for FILE_OPENED to FMODE_OPENED ... and don't bother with setting FILE_OPENED at all. Acked-by: Linus Torvalds Signed-off-by: Al Viro --- fs/open.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'fs/open.c') diff --git a/fs/open.c b/fs/open.c index ee893240d199..d2030a3c5c52 100644 --- a/fs/open.c +++ b/fs/open.c @@ -846,15 +846,10 @@ int finish_open(struct file *file, struct dentry *dentry, int (*open)(struct inode *, struct file *), int *opened) { - int error; - BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */ + BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */ file->f_path.dentry = dentry; - error = do_dentry_open(file, d_backing_inode(dentry), open); - if (!error) - *opened |= FILE_OPENED; - - return error; + return do_dentry_open(file, d_backing_inode(dentry), open); } EXPORT_SYMBOL(finish_open); -- cgit