| Message ID | f73cd334-4ff3-9f56-941a-eaba6c528ba2@jp.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2018年05月21日 12:57, Misono Tomohiro wrote: > btrfs_read_fs_root_no_name() may return ERR_PTR(-ENOENT) or > ERR_PTR(-ENOMEM) and therefore search_ioctl() and > btrfs_search_path_in_tree() should use PTR_ERR() instead of -ENOENT, > which all other callers of btrfs_read_fs_root_no_name() does. > > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/ioctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 8f7c1b9a2db7..0f90e68ca512 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -2155,7 +2155,7 @@ static noinline int search_ioctl(struct inode *inode, > root = btrfs_read_fs_root_no_name(info, &key); > if (IS_ERR(root)) { > btrfs_free_path(path); > - return -ENOENT; > + return PTR_ERR(root); > } > } > > @@ -2290,7 +2290,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, > root = btrfs_read_fs_root_no_name(info, &key); > if (IS_ERR(root)) { > btrfs_err(info, "could not find root %llu", tree_id); > - ret = -ENOENT; > + ret = PTR_ERR(root); > goto out; > } > >
On Mon, May 21, 2018 at 01:57:27PM +0900, Misono Tomohiro wrote: > btrfs_read_fs_root_no_name() may return ERR_PTR(-ENOENT) or > ERR_PTR(-ENOMEM) and therefore search_ioctl() and > btrfs_search_path_in_tree() should use PTR_ERR() instead of -ENOENT, > which all other callers of btrfs_read_fs_root_no_name() does. > > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> > --- > fs/btrfs/ioctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 8f7c1b9a2db7..0f90e68ca512 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -2155,7 +2155,7 @@ static noinline int search_ioctl(struct inode *inode, > root = btrfs_read_fs_root_no_name(info, &key); > if (IS_ERR(root)) { > btrfs_free_path(path); > - return -ENOENT; > + return PTR_ERR(root); > } > } > > @@ -2290,7 +2290,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, > root = btrfs_read_fs_root_no_name(info, &key); > if (IS_ERR(root)) { > btrfs_err(info, "could not find root %llu", tree_id); We should probably drop this message too, as there are now 2 errors and "not found" after ENOMEM does not make sense. Otherwise ok Reviewed-by: David Sterba <dsterba@suse.com> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 8f7c1b9a2db7..0f90e68ca512 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2155,7 +2155,7 @@ static noinline int search_ioctl(struct inode *inode, root = btrfs_read_fs_root_no_name(info, &key); if (IS_ERR(root)) { btrfs_free_path(path); - return -ENOENT; + return PTR_ERR(root); } } @@ -2290,7 +2290,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, root = btrfs_read_fs_root_no_name(info, &key); if (IS_ERR(root)) { btrfs_err(info, "could not find root %llu", tree_id); - ret = -ENOENT; + ret = PTR_ERR(root); goto out; }
btrfs_read_fs_root_no_name() may return ERR_PTR(-ENOENT) or ERR_PTR(-ENOMEM) and therefore search_ioctl() and btrfs_search_path_in_tree() should use PTR_ERR() instead of -ENOENT, which all other callers of btrfs_read_fs_root_no_name() does. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> --- fs/btrfs/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)