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

Commit 2304059f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fs: kernfs: add poll file operation"

parents 3aa13521 30725e9b

fs/kernfs/file.c

+20 −11
Original line number Diff line number Diff line
@@ -832,26 +832,35 @@ void kernfs_drain_open_files(struct kernfs_node *kn) 
 * to see if it supports poll (Neither 'poll' nor 'select' return

 * an appropriate error code).  When in doubt, set a suitable timeout value.

 */

static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)

__poll_t kernfs_generic_poll(struct kernfs_open_file *of, poll_table *wait)

{

	struct kernfs_open_file *of = kernfs_of(filp);

	struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry);

	struct kernfs_node *kn = kernfs_dentry_node(of->file->f_path.dentry);

	struct kernfs_open_node *on = kn->attr.open;



	if (!kernfs_get_active(kn))

		goto trigger;



	poll_wait(filp, &on->poll, wait);



	kernfs_put_active(kn);

	poll_wait(of->file, &on->poll, wait);



	if (of->event != atomic_read(&on->event))

		goto trigger;

		return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;



	return DEFAULT_POLLMASK;

}



static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)

{

	struct kernfs_open_file *of = kernfs_of(filp);

	struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry);

	__poll_t ret;



 trigger:

	if (!kernfs_get_active(kn))

		return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;



	if (kn->attr.ops->poll)

		ret = kn->attr.ops->poll(of, wait);

	else

		ret = kernfs_generic_poll(of, wait);



	kernfs_put_active(kn);

	return ret;

}



static void kernfs_notify_workfn(struct work_struct *work)

include/linux/kernfs.h

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct seq_file; 
struct vm_area_struct;

struct super_block;

struct file_system_type;

struct poll_table_struct;



struct kernfs_open_node;

struct kernfs_iattrs;
@@ -261,6 +262,9 @@ struct kernfs_ops { 
	ssize_t (*write)(struct kernfs_open_file *of, char *buf, size_t bytes,

			 loff_t off);



	__poll_t (*poll)(struct kernfs_open_file *of,

			 struct poll_table_struct *pt);



	int (*mmap)(struct kernfs_open_file *of, struct vm_area_struct *vma);



#ifdef CONFIG_DEBUG_LOCK_ALLOC
@@ -350,6 +354,8 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name, 
int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,

		     const char *new_name, const void *new_ns);

int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr);

__poll_t kernfs_generic_poll(struct kernfs_open_file *of,

			     struct poll_table_struct *pt);

void kernfs_notify(struct kernfs_node *kn);



const void *kernfs_super_ns(struct super_block *sb);