| Message ID | 20200525063257.46757-19-wqu@suse.com |
|---|---|
| State | Accepted |
| Commit | 5bdcb37495d594c352221f582e31a0ec04b7d58b |
| Headers | show |
| Series | fs: btrfs: Re-implement btrfs support using the more widely used extent buffer base code | expand |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 007cf32c1603..da2a5e90a1bf 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -217,8 +217,12 @@ static u64 __get_parent_inode(struct __btrfs_root *root, u64 inr, static inline int next_length(const char *path) { int res = 0; - while (*path != '\0' && *path != '/' && res <= BTRFS_NAME_LEN) - ++res, ++path; + while (*path != '\0' && *path != '/') { + ++res; + ++path; + if (res > BTRFS_NAME_LEN) + break; + } return res; }
All existing next_length() caller handles return value > BTRFS_NAME_LEN, so there is no need to do BTRFS_NAME_LEN check in next_length(). But still, we want to exit early if we're beyond BTRFS_NAME_LEN, so this patch will make next_length() to exit as soon as we're beyond BTRFS_NAME_LEN. Signed-off-by: Qu Wenruo <wqu at suse.com> --- fs/btrfs/inode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)