Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / fs / dquot.c

diff --git a/fs/dquot.c b/fs/dquot.c
index ad7e59003e0445943d21f8b9f78090f7b9e19b53..5e95261005b2ac68f2103ae7468f257c57ba89da 100644 (file)
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -9,8 +9,6 @@
  * implementation is based on one of the several variants of the LINUX
  * inode-subsystem with added complexity of the diskquota system.
  * 
- * Version: $Id: dquot.c,v 6.3 1996/11/17 18:35:34 mvw Exp mvw $
- * 
  * Author:     Marco van Wieringen <mvw@planets.elm.net>
  *
  * Fixes:   Dmitry Gorodchanin <pgmdsg@ibi.com>, 11 Feb 96
@@ -1807,19 +1805,19 @@ int vfs_quota_on_path(struct super_block *sb, int type, int format_id,
 }
 
 /* Actual function called from quotactl() */
-int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path,
+int vfs_quota_on(struct super_block *sb, int type, int format_id, char *name,
                 int remount)
 {
-       struct nameidata nd;
+       struct path path;
        int error;
 
        if (remount)
                return vfs_quota_on_remount(sb, type);
 
-       error = path_lookup(path, LOOKUP_FOLLOW, &nd);
+       error = kern_path(name, LOOKUP_FOLLOW, &path);
        if (!error) {
-               error = vfs_quota_on_path(sb, type, format_id, &nd.path);
-               path_put(&nd.path);
+               error = vfs_quota_on_path(sb, type, format_id, &path);
+               path_put(&path);
        }
        return error;
 }