diff options
| author | Linus Torvalds | 2017-07-08 10:50:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-07-08 10:50:54 -0700 |
| commit | b8d4c1f9f48e344fe1d6e6ffae01d4b31bf0aac0 (patch) | |
| tree | 24685a7b0ebf8af0ff55f1384e0be125aa29da47 /fs/minix | |
| parent | 090a81d8766e21d33ab3e4d24e6c8e5eedf086dd (diff) | |
| parent | 49d31c2f389acfe83417083e1208422b4091cd9e (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc filesystem updates from Al Viro:
"Assorted normal VFS / filesystems stuff..."
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
dentry name snapshots
Make statfs properly return read-only state after emergency remount
fs/dcache: init in_lookup_hashtable
minix: Deinline get_block, save 2691 bytes
fs: Reorder inode_owner_or_capable() to avoid needless
fs: warn in case userspace lied about modprobe return
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/itree_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/minix/itree_common.c b/fs/minix/itree_common.c index 4c57c9af6946..2d1ca08870f7 100644 --- a/fs/minix/itree_common.c +++ b/fs/minix/itree_common.c @@ -142,7 +142,7 @@ changed: return -EAGAIN; } -static inline int get_block(struct inode * inode, sector_t block, +static int get_block(struct inode * inode, sector_t block, struct buffer_head *bh, int create) { int err = -EIO; |