diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 18:38:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 18:38:47 -0800 |
| commit | bd90741318ee0a48244e8e4b9364023d730a80a9 (patch) | |
| tree | 5c6facabc5b100cc321bb9e5c0a805a6931aa0cd /fs/sysv/itree.c | |
| parent | 13c574fec815f449fa812df60844bbb4b1548d19 (diff) | |
| parent | e0c49bd2b4d3cd1751491eb2d940bce968ac65e9 (diff) | |
| download | linux-bd90741318ee0a48244e8e4b9364023d730a80a9.tar.gz linux-bd90741318ee0a48244e8e4b9364023d730a80a9.tar.bz2 linux-bd90741318ee0a48244e8e4b9364023d730a80a9.zip | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"misc pile"
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: sysv: Fix sysv_nblocks() returns wrong value
get rid of INT_LIMIT, use type_max() instead
btrfs: replace INT_LIMIT(loff_t) with OFFSET_MAX
fs: simplify vfs_get_super
fs: drop useless condition from inode_needs_update_time
Diffstat (limited to 'fs/sysv/itree.c')
| -rw-r--r-- | fs/sysv/itree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index d4ec9bb97de9..3b8567564e7e 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c @@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size) res += blocks; direct = 1; } - return blocks; + return res; } int sysv_getattr(struct user_namespace *mnt_userns, const struct path *path, |