->atomic_open(): return 0 in all success cases

FMODE_OPENED can be used to distingusish "successful open" from the
"called finish_no_open(), do it yourself" cases.  Since finish_no_open()
has been adjusted, no changes in the instances were actually needed.
The caller has been adjusted.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namei.c b/fs/namei.c
index 6def3e1..e213e7b 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3054,21 +3054,21 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
                                       open_to_namei_flags(open_flag), mode);
        d_lookup_done(dentry);
        if (!error) {
-               /*
-                * We didn't have the inode before the open, so check open
-                * permission here.
-                */
-               int acc_mode = op->acc_mode;
-               if (file->f_mode & FMODE_CREATED) {
-                       WARN_ON(!(open_flag & O_CREAT));
-                       fsnotify_create(dir, dentry);
-                       acc_mode = 0;
-               }
-               error = may_open(&file->f_path, acc_mode, open_flag);
-               if (WARN_ON(error > 0))
-                       error = -EINVAL;
-       } else if (error > 0) {
-               if (WARN_ON(file->f_path.dentry == DENTRY_NOT_SET)) {
+               if (file->f_mode & FMODE_OPENED) {
+                       /*
+                        * We didn't have the inode before the open, so check open
+                        * permission here.
+                        */
+                       int acc_mode = op->acc_mode;
+                       if (file->f_mode & FMODE_CREATED) {
+                               WARN_ON(!(open_flag & O_CREAT));
+                               fsnotify_create(dir, dentry);
+                               acc_mode = 0;
+                       }
+                       error = may_open(&file->f_path, acc_mode, open_flag);
+                       if (WARN_ON(error > 0))
+                               error = -EINVAL;
+               } else if (WARN_ON(file->f_path.dentry == DENTRY_NOT_SET)) {
                        error = -EIO;
                } else {
                        if (file->f_path.dentry) {

diff --git a/fs/open.c b/fs/open.c
index dbaac9e..d98e192 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -863,13 +863,13 @@ EXPORT_SYMBOL(finish_open);
  * NB: unlike finish_open() this function does consume the dentry reference and
  * the caller need not dput() it.
  *
- * Returns "1" which must be the return value of ->atomic_open() after having
+ * Returns "0" which must be the return value of ->atomic_open() after having
  * called this function.
  */
 int finish_no_open(struct file *file, struct dentry *dentry)
 {
        file->f_path.dentry = dentry;
-       return 1;
+       return 0;
 }
 EXPORT_SYMBOL(finish_no_open);