diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-08 13:04:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-08 13:04:49 -0800 |
| commit | 236f45329460f76d058111de1a1cea12f5a8b734 (patch) | |
| tree | ca848d9200a3a785f6cbbbff2720a4ff021c5947 /include/linux | |
| parent | 995933305e11dc8698fdba249ca5f2d145b1d657 (diff) | |
| parent | 12efec5602744c5a185049eb4fcfd9aebe01bd6f (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
- bmap series from cmaiolino
- getting rid of convolutions in copy_mount_options() (use a couple of
copy_from_user() instead of the __get_user() crap)
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
saner copy_mount_options()
fibmap: Reject negative block numbers
fibmap: Use bmap instead of ->bmap method in ioctl_fibmap
ecryptfs: drop direct calls to ->bmap
cachefiles: drop direct usage of ->bmap method.
fs: Enable bmap() function to properly return errors
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6eae91c0668f..320d51b24325 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2876,9 +2876,16 @@ static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count) extern void emergency_sync(void); extern void emergency_remount(void); + #ifdef CONFIG_BLOCK -extern sector_t bmap(struct inode *, sector_t); +extern int bmap(struct inode *inode, sector_t *block); +#else +static inline int bmap(struct inode *inode, sector_t *block) +{ + return -EINVAL; +} #endif + extern int notify_change(struct dentry *, struct iattr *, struct inode **); extern int inode_permission(struct inode *, int); extern int generic_permission(struct inode *, int); |