VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)

[linux-2.6-block.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index a3fde77d4abffd0270a53d06bcd22bc3d25a1558..c83145af4bfc0ea9bb159002e3545e8a8cd65157 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -118,15 +118,6 @@
  * POSIX.1 2.4: an empty pathname is invalid (ENOENT).
  * PATH_MAX includes the nul terminator --RR.
  */
-void final_putname(struct filename *name)
-{
-       if (name->separate) {
-               __putname(name->name);
-               kfree(name);
-       } else {
-               __putname(name);
-       }
-}
 
 #define EMBEDDED_NAME_MAX      (PATH_MAX - sizeof(struct filename))
 
@@ -145,6 +136,7 @@ getname_flags(const char __user *filename, int flags, int *empty)
        result = __getname();
        if (unlikely(!result))
                return ERR_PTR(-ENOMEM);
+       result->refcnt = 1;
 
        /*
         * First, try to embed the struct filename inside the names_cache
@@ -179,6 +171,7 @@ recopy:
                }
                result->name = kname;
                result->separate = true;
+               result->refcnt = 1;
                max = PATH_MAX;
                goto recopy;
        }
@@ -202,7 +195,7 @@ recopy:
        return result;
 
 error:
-       final_putname(result);
+       putname(result);
        return err;
 }
 
@@ -243,19 +236,25 @@ getname_kernel(const char * filename)
        memcpy((char *)result->name, filename, len);
        result->uptr = NULL;
        result->aname = NULL;
+       result->refcnt = 1;
        audit_getname(result);
 
        return result;
 }
 
-#ifdef CONFIG_AUDITSYSCALL
 void putname(struct filename *name)
 {
-       if (unlikely(!audit_dummy_context()))
-               return audit_putname(name);
-       final_putname(name);
+       BUG_ON(name->refcnt <= 0);
+
+       if (--name->refcnt > 0)
+               return;
+
+       if (name->separate) {
+               __putname(name->name);
+               kfree(name);
+       } else
+               __putname(name);
 }
-#endif
 
 static int check_acl(struct inode *inode, int mask)
 {
@@ -2815,7 +2814,7 @@ no_open:
                        } else if (!dentry->d_inode) {
                                goto out;
                        } else if ((open_flag & O_TRUNC) &&
-                                  S_ISREG(dentry->d_inode->i_mode)) {
+                                  d_is_reg(dentry)) {
                                goto out;
                        }
                        /* will fail later, go on to get the right error */