Messages in this thread |  | | | Date | Tue, 21 Sep 2010 14:53:47 -0400 | | From | Valerie Aurora <> | | Subject | Re: [PATCH 01/34] VFS: Make clone_mnt() and copy_tree() return error codes |
| |
On Mon, Sep 20, 2010 at 11:26:42PM +0200, Andreas Gruenbacher wrote: > collect_mounts() now also returns error pointers instead of NULL upon > failure: > > diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c > index 46a57b5..898da28 100644 > --- a/kernel/audit_tree.c > +++ b/kernel/audit_tree.c > @@ -579,7 +579,7 @@ void audit_trim_trees(void) > > root_mnt = collect_mounts(&path); > path_put(&path); > - if (!root_mnt) > + if (IS_ERR(root_mnt)) > goto skip_it; > > spin_lock(&hash_lock); > @@ -651,8 +651,8 @@ int audit_add_tree_rule(struct audit_krule *rule) > goto Err; > mnt = collect_mounts(&path); > path_put(&path); > - if (!mnt) { > - err = -ENOMEM; > + if (IS_ERR(mnt)) { > + err = PTR_ERR(mnt); > goto Err; > } > > @@ -701,8 +701,8 @@ int audit_tag_tree(char *old, char *new) > return err; > tagged = collect_mounts(&path2); > path_put(&path2); > - if (!tagged) > - return -ENOMEM; > + if (IS_ERR(tagged)) > + return PTR_ERR(tagged); > > err = kern_path(old, 0, &path1); > if (err) {
Thanks for the fix, folded in.
-VAL
|  |