audit: do not call audit_getname on error

Just a code cleanup really.  We don't need to make a function call just for
it to return on error.  This also makes the VFS function even easier to follow
and removes a conditional on a hot path.

Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 13 insertions, 15 deletions

diff --git a/fs/namei.c b/fs/namei.c
index c283a1ec008e..208c6aa4a989 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -140,21 +140,19 @@ static int do_getname(const char __user *filename, char *page)
 
 static char *getname_flags(const char __user *filename, int flags, int *empty)
 {
-        char *tmp, *result;
-
-        result = ERR_PTR(-ENOMEM);
-        tmp = __getname();
-        if (tmp)  {
-                int retval = do_getname(filename, tmp);
-
-                result = tmp;
-                if (retval < 0) {
-                        if (retval == -ENOENT && empty)
-                                *empty = 1;
-                        if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
-                                __putname(tmp);
-                                result = ERR_PTR(retval);
-                        }
+        char *result = __getname();
+        int retval;
+
+        if (!result)
+                return ERR_PTR(-ENOMEM);
+
+        retval = do_getname(filename, result);
+        if (retval < 0) {
+                if (retval == -ENOENT && empty)
+                        *empty = 1;
+                if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
+                        __putname(result);
+                        return ERR_PTR(retval);
                 }
         }
         audit_getname(result);