diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 20:19:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 20:19:49 -0700 |
| commit | 8adcc59974b8a65b7eac7d503364837c297139bc (patch) | |
| tree | 4ab2a60bb6d058e5b18d175fc4c97c9c05f13185 /fs/ntfs/namei.c | |
| parent | Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | fs/exofs: only use true/false for asignment of bool type variable (diff) | |
| download | linux-dev-8adcc59974b8a65b7eac7d503364837c297139bc.tar.xz linux-dev-8adcc59974b8a65b7eac7d503364837c297139bc.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"No common topic, really - a handful of assorted stuff; the least
trivial bits are Mark's dedupe patches"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs/exofs: only use true/false for asignment of bool type variable
fs/exofs: fix potential memory leak in mount option parsing
Delete invalid assignment statements in do_sendfile
iomap: remove duplicated include from iomap.c
vfs: dedupe should return EPERM if permission is not granted
vfs: allow dedupe of user owned read-only files
ntfs: don't open-code ERR_CAST
ext4: don't open-code ERR_CAST
Diffstat (limited to 'fs/ntfs/namei.c')
| -rw-r--r-- | fs/ntfs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c index 4690cd75d8d7..3986c7a1f6a8 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c @@ -312,7 +312,7 @@ static struct dentry *ntfs_get_parent(struct dentry *child_dent) /* Get the mft record of the inode belonging to the child dentry. */ mrec = map_mft_record(ni); if (IS_ERR(mrec)) - return (struct dentry *)mrec; + return ERR_CAST(mrec); /* Find the first file name attribute in the mft record. */ ctx = ntfs_attr_get_search_ctx(ni, mrec); if (unlikely(!ctx)) { |