tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix up fsnotify.h merge error in previous upstream merge.

Browse Source 
Commit dd5c936967 ("Merge 7e63420847 ("Merge tag 'acpi-5.7-rc1-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into
android-mainline") was not done properly, and had a half-completed merge
of fsnotify.h

This should fix that build issue.

Thanks to YongQin Liu for the quick notice of this error.

Reported-by: YongQin Liu <yongqin.liu@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5fabf513c150cbd833215b71d89f8ff38d8b9e33
This commit is contained in:
Greg Kroah-Hartman
2020-04-09 14:52:40 +02:00
parent bfcc51e5fd
commit 0066ae3a5e
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/fsnotify.h
+4 -14
View File
@@ -30,16 +30,6 @@ static inline int fsnotify_dirent(struct inode *dir, struct dentry *dentry,
&dentry->d_name, 0);
}
/* Notify this dentry's parent about a child's events. */
static inline int fsnotify_parent(const struct path *path,
struct dentry *dentry, __u32 mask)
{
if (!dentry)
dentry = path->dentry;
return __fsnotify_parent(path, dentry, mask);
}
/*
* Simple wrapper to consolidate calls fsnotify_parent()/fsnotify() when
* an event is on a path.
@@ -47,7 +37,7 @@ static inline int fsnotify_parent(const struct path *path,
static inline int fsnotify_path(struct inode *inode, const struct path *path,
__u32 mask)
{
int ret = fsnotify_parent(path, NULL, mask);
int ret = fsnotify_parent(path->dentry, mask, path, FSNOTIFY_EVENT_PATH);
if (ret)
return ret;
@@ -273,7 +263,7 @@ static inline void fsnotify_open(struct file *file)
if (path->dentry->d_op && path->dentry->d_op->d_canonical_path) {
path->dentry->d_op->d_canonical_path(path, &lower_path);
fsnotify_parent(&lower_path, NULL, mask);
fsnotify_parent(lower_path.dentry, mask, &lower_path, FSNOTIFY_EVENT_PATH);
fsnotify(lower_path.dentry->d_inode, mask, &lower_path, FSNOTIFY_EVENT_PATH, NULL, 0);
path_put(&lower_path);
}
@@ -308,7 +298,7 @@ static inline void fsnotify_xattr(struct dentry *dentry)
if (S_ISDIR(inode->i_mode))
mask |= FS_ISDIR;
fsnotify_parent(NULL, dentry, mask);
fsnotify_parent(dentry, mask, inode, FSNOTIFY_EVENT_INODE);
fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
}
@@ -343,7 +333,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
if (S_ISDIR(inode->i_mode))
mask |= FS_ISDIR;
fsnotify_parent(NULL, dentry, mask);
fsnotify_parent(dentry, mask, inode, FSNOTIFY_EVENT_INODE);
fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
}
}