hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fsnotify: pass a file instead of an inode to open, read, and write 

fanotify, the upcoming notification system actually needs a struct path so it can
do opens in the context of listeners, and it needs a file so it can get f_flags
from the original process.  Close was the only operation that already was passing
a struct file to the notification hook.  This patch passes a file for access,
modify, and open as well as they are easily available to these hooks.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris 2009-12-17 21:24:21 -05:00
parent 8112e2d6a7
commit 2a12a9d781
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/compat.c
View File

@ -1193,11 +1193,10 @@ out:
if (iov != iovstack) if (iov != iovstack)
kfree(iov); kfree(iov);
if ((ret + (type == READ)) > 0) { if ((ret + (type == READ)) > 0) {
struct dentry *dentry = file->f_path.dentry;
if (type == READ) if (type == READ)
fsnotify_access(dentry); fsnotify_access(file);
else else
fsnotify_modify(dentry); fsnotify_modify(file);
} }
return ret; return ret;
} }

4
fs/exec.c
View File

@ -129,7 +129,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
goto exit; goto exit;
fsnotify_open(file->f_path.dentry); fsnotify_open(file);
error = -ENOEXEC; error = -ENOEXEC;
if(file->f_op) { if(file->f_op) {
@ -683,7 +683,7 @@ struct file *open_exec(const char *name)
if (file->f_path.mnt->mnt_flags & MNT_NOEXEC) if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
goto exit; goto exit;
fsnotify_open(file->f_path.dentry); fsnotify_open(file);
err = deny_write_access(file); err = deny_write_access(file);
if (err) if (err)

4
fs/nfsd/vfs.c
View File

@ -951,7 +951,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
nfsdstats.io_read += host_err; nfsdstats.io_read += host_err;
*count = host_err; *count = host_err;
err = 0; err = 0;
fsnotify_access(file->f_path.dentry); fsnotify_access(file);
} else } else
err = nfserrno(host_err); err = nfserrno(host_err);
out: out:
@ -1062,7 +1062,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
goto out_nfserr; goto out_nfserr;
*cnt = host_err; *cnt = host_err;
nfsdstats.io_write += host_err; nfsdstats.io_write += host_err;
fsnotify_modify(file->f_path.dentry); fsnotify_modify(file);
/* clear setuid/setgid flag after write */ /* clear setuid/setgid flag after write */
if (inode->i_mode & (S_ISUID | S_ISGID)) if (inode->i_mode & (S_ISUID | S_ISGID))

2
fs/open.c
View File

@ -889,7 +889,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
put_unused_fd(fd); put_unused_fd(fd);
fd = PTR_ERR(f); fd = PTR_ERR(f);
} else { } else {
fsnotify_open(f->f_path.dentry); fsnotify_open(f);
fd_install(fd, f); fd_install(fd, f);
} }
} }

8
fs/read_write.c
View File

@ -311,7 +311,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
else else
ret = do_sync_read(file, buf, count, pos); ret = do_sync_read(file, buf, count, pos);
if (ret > 0) { if (ret > 0) {
fsnotify_access(file->f_path.dentry); fsnotify_access(file);
add_rchar(current, ret); add_rchar(current, ret);
} }
inc_syscr(current); inc_syscr(current);
@ -367,7 +367,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
else else
ret = do_sync_write(file, buf, count, pos); ret = do_sync_write(file, buf, count, pos);
if (ret > 0) { if (ret > 0) {
fsnotify_modify(file->f_path.dentry); fsnotify_modify(file);
add_wchar(current, ret); add_wchar(current, ret);
} }
inc_syscw(current); inc_syscw(current);
@ -675,9 +675,9 @@ out:
kfree(iov); kfree(iov);
if ((ret + (type == READ)) > 0) { if ((ret + (type == READ)) > 0) {
if (type == READ) if (type == READ)
fsnotify_access(file->f_path.dentry); fsnotify_access(file);
else else
fsnotify_modify(file->f_path.dentry); fsnotify_modify(file);
} }
return ret; return ret;
} }

15
include/linux/fsnotify.h
View File

@ -153,8 +153,9 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
/* /*
* fsnotify_access - file was read * fsnotify_access - file was read
*/ */
static inline void fsnotify_access(struct dentry *dentry) static inline void fsnotify_access(struct file *file)
{ {
struct dentry *dentry = file->f_path.dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
__u32 mask = FS_ACCESS; __u32 mask = FS_ACCESS;
@ -162,14 +163,15 @@ static inline void fsnotify_access(struct dentry *dentry)
mask |= FS_IN_ISDIR; mask |= FS_IN_ISDIR;
fsnotify_parent(dentry, mask); fsnotify_parent(dentry, mask);
fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0); fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
} }
/* /*
* fsnotify_modify - file was modified * fsnotify_modify - file was modified
*/ */
static inline void fsnotify_modify(struct dentry *dentry) static inline void fsnotify_modify(struct file *file)
{ {
struct dentry *dentry = file->f_path.dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
__u32 mask = FS_MODIFY; __u32 mask = FS_MODIFY;
@ -177,14 +179,15 @@ static inline void fsnotify_modify(struct dentry *dentry)
mask |= FS_IN_ISDIR; mask |= FS_IN_ISDIR;
fsnotify_parent(dentry, mask); fsnotify_parent(dentry, mask);
fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0); fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
} }
/* /*
* fsnotify_open - file was opened * fsnotify_open - file was opened
*/ */
static inline void fsnotify_open(struct dentry *dentry) static inline void fsnotify_open(struct file *file)
{ {
struct dentry *dentry = file->f_path.dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
__u32 mask = FS_OPEN; __u32 mask = FS_OPEN;
@ -192,7 +195,7 @@ static inline void fsnotify_open(struct dentry *dentry)
mask |= FS_IN_ISDIR; mask |= FS_IN_ISDIR;
fsnotify_parent(dentry, mask); fsnotify_parent(dentry, mask);
fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0); fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
} }
/* /*