diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-27 08:07:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-27 08:07:12 -0800 |
| commit | 5ceabb6078b80a8544ba86d6ee523ad755ae6d5e (patch) | |
| tree | 69ebf199a0fb3caece18596ad11f75354a96b654 /kernel | |
| parent | 580cd7736f6b40dbe1d5514eb59744bc24328e4b (diff) | |
| parent | 6f24784f00f2b5862b367caeecc5cca22a77faa3 (diff) | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff pile - no common topic here"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
whack-a-mole: don't open-code iminor/imajor
9p: fix misuse of sscanf() in v9fs_stat2inode()
audit_alloc_mark(): don't open-code ERR_CAST()
fs/inode.c: make inode_init_always() initialize i_ino to 0
vfs: don't unnecessarily clone write access for writable fds
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit_fsnotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c index 5b3f01da172b..60739d5e3373 100644 --- a/kernel/audit_fsnotify.c +++ b/kernel/audit_fsnotify.c @@ -84,7 +84,7 @@ struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pa dentry = kern_path_locked(pathname, &path); if (IS_ERR(dentry)) - return (void *)dentry; /* returning an error */ + return ERR_CAST(dentry); /* returning an error */ inode = path.dentry->d_inode; inode_unlock(inode); |