From c7245bd89bed53572a8fb137ae59a697f116b28f Mon Sep 17 00:00:00 2001 From: ericm Date: Mon, 28 Jul 2003 16:35:57 +0000 Subject: [PATCH] merge b_devel to b_eq: 20030728 (5) osc ost ptlbd ptlrpc --- lustre/osc/osc_lib.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/osc/osc_lib.c b/lustre/osc/osc_lib.c index 48a88d2..e4219b0 100644 --- a/lustre/osc/osc_lib.c +++ b/lustre/osc/osc_lib.c @@ -30,6 +30,7 @@ # include # include # include +# include /* convert a pathname into a kdev_t */ static kdev_t path2dev(char *path) @@ -38,11 +39,8 @@ static kdev_t path2dev(char *path) struct nameidata nd; kdev_t dev = KDEVT_INIT(0); - if (!path_init(path, LOOKUP_FOLLOW, &nd)) - return 0; - - if (path_walk(path, &nd)) - return 0; + if (ll_path_lookup(path, LOOKUP_FOLLOW, &nd)) + return val_to_kdev(0); dentry = nd.dentry; if (dentry->d_inode && !is_bad_inode(dentry->d_inode) && -- 1.8.3.1