diff options
| author | Qu Wenruo <wqu@suse.com> | 2020-06-24 18:03:04 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-07 20:57:27 -0400 |
| commit | 5bdcb37495d594c352221f582e31a0ec04b7d58b (patch) | |
| tree | ca98adde9d3387f846c75c3b7ac43ad813bb70bc /fs/btrfs | |
| parent | 92bc179c5f85d0d55f2fecfbcaec8852e84fa0a4 (diff) | |
| download | u-boot-5bdcb37495d594c352221f582e31a0ec04b7d58b.tar.gz u-boot-5bdcb37495d594c352221f582e31a0ec04b7d58b.tar.bz2 u-boot-5bdcb37495d594c352221f582e31a0ec04b7d58b.zip | |
fs: btrfs: inode: Allow next_length() to return value > BTRFS_NAME_LEN
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 makes next_length() exit as soon as we're beyond BTRFS_NAME_LEN.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 007cf32c16..da2a5e90a1 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; } |