[PATCH] misc fixes

- Fix error-path mem leak in __vfs_follow_link() (From a recent AC->2.4
  patch)

- Make drivers/net/aironet4500_proc.c:driver_lock static.

diff --git a/drivers/net/aironet4500_proc.c b/drivers/net/aironet4500_proc.c
index 42bc6c9d0046b39ee8e897326384448dc9465760..3812bac1ceec403c530bc021f78c6a485bfdff86 100644 (file)
--- a/drivers/net/aironet4500_proc.c
+++ b/drivers/net/aironet4500_proc.c
@@ -42,7 +42,7 @@
 #define DEV_AWC_INFO   1
 #define DEV_AWC        1
 
-spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
 
 struct awc_proc_private{
        struct ctl_table_header *       sysctl_header;

diff --git a/fs/namei.c b/fs/namei.c
index e3d12fc5045244f97dabe3ccd86629dbe5e3e2a9..2dbd2642362cfae6e9036677194b5bc5c41c4257 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2128,8 +2128,10 @@ out:
         * bloody create() on broken symlinks. Furrfu...
         */
        name = __getname();
-       if (!name)
+       if (unlikely(!name)) {
+               path_release(nd);
                return -ENOMEM;
+       }
        strcpy(name, nd->last.name);
        nd->last.name = name;
        return 0;