diff --git a/[refs] b/[refs] index 92dd26c3a1be..6a85a81fbb21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c1e52aa905f2223dc600cfeda6c0dc94fac8b81 +refs/heads/master: 7b62536141927212158ab84ce2afda9319ae6f2d diff --git a/trunk/fs/gfs2/ops_export.c b/trunk/fs/gfs2/ops_export.c index 4b8c6a9893e4..470e8829e7f4 100644 --- a/trunk/fs/gfs2/ops_export.c +++ b/trunk/fs/gfs2/ops_export.c @@ -182,6 +182,10 @@ static struct dentry *gfs2_get_parent(struct dentry *child) if (!inode) return ERR_PTR(-ENOENT); + /* + * In case of an error, @inode carries the error value, and we + * have to return that as a(n invalid) pointer to dentry. + */ if (IS_ERR(inode)) return ERR_PTR(PTR_ERR(inode));