Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a12a9d7 authored by Eric Paris's avatar Eric Paris
Browse files

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: default avatarEric Paris <eparis@redhat.com>
parent 8112e2d6

fs/compat.c

+2 −3
Original line number Diff line number Diff line
@@ -1193,11 +1193,10 @@ static ssize_t compat_do_readv_writev(int type, struct file *file, 
	if (iov != iovstack)

		kfree(iov);

	if ((ret + (type == READ)) > 0) {

		struct dentry *dentry = file->f_path.dentry;

		if (type == READ)

			fsnotify_access(dentry);

			fsnotify_access(file);

		else

			fsnotify_modify(dentry);

			fsnotify_modify(file);

	}

	return ret;

}

fs/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) 
	if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)

		goto exit;



	fsnotify_open(file->f_path.dentry);

	fsnotify_open(file);



	error = -ENOEXEC;

	if(file->f_op) {
@@ -683,7 +683,7 @@ struct file *open_exec(const char *name) 
	if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)

		goto exit;



	fsnotify_open(file->f_path.dentry);

	fsnotify_open(file);



	err = deny_write_access(file);

	if (err)

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
		nfsdstats.io_read += host_err;

		*count = host_err;

		err = 0;

		fsnotify_access(file->f_path.dentry);

		fsnotify_access(file);

	} else 

		err = nfserrno(host_err);

out:
@@ -1062,7 +1062,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
		goto out_nfserr;

	*cnt = host_err;

	nfsdstats.io_write += host_err;

	fsnotify_modify(file->f_path.dentry);

	fsnotify_modify(file);



	/* clear setuid/setgid flag after write */

	if (inode->i_mode & (S_ISUID | S_ISGID))

fs/open.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode) 
				put_unused_fd(fd);

				fd = PTR_ERR(f);

			} else {

				fsnotify_open(f->f_path.dentry);

				fsnotify_open(f);

				fd_install(fd, f);

			}

		}

fs/read_write.c

+4 −4
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) 
		else

			ret = do_sync_read(file, buf, count, pos);

		if (ret > 0) {

			fsnotify_access(file->f_path.dentry);

			fsnotify_access(file);

			add_rchar(current, ret);

		}

		inc_syscr(current);
@@ -367,7 +367,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ 
		else

			ret = do_sync_write(file, buf, count, pos);

		if (ret > 0) {

			fsnotify_modify(file->f_path.dentry);

			fsnotify_modify(file);

			add_wchar(current, ret);

		}

		inc_syscw(current);
@@ -675,9 +675,9 @@ static ssize_t do_readv_writev(int type, struct file *file, 
		kfree(iov);

	if ((ret + (type == READ)) > 0) {

		if (type == READ)

			fsnotify_access(file->f_path.dentry);

			fsnotify_access(file);

		else

			fsnotify_modify(file->f_path.dentry);

			fsnotify_modify(file);

	}

	return ret;

}