Commit 9022ca6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "Assorted stuff, including Christoph's I_DIRTY patches"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: move I_DIRTY_INODE to fs.h
  ubifs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
  ntfs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
  gfs2: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) calls
  fs: fold open_check_o_direct into do_dentry_open
  vfs: Replace stray non-ASCII homoglyph characters with their ASCII equivalents
  vfs: make sure struct filename->iname is word-aligned
  get rid of pointless includes of fs_struct.h
  [poll] annotate SAA6588_CMD_POLL users
parents 38c23685 0e11f644

arch/arc/kernel/troubleshoot.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/kdev_t.h>

#include <linux/fs_struct.h>

#include <linux/proc_fs.h>

#include <linux/file.h>

#include <linux/sched/mm.h>

drivers/media/i2c/saa6588.c

+2 −2
Original line number Diff line number Diff line
@@ -411,9 +411,9 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) 
		break;

		/* --- poll() for /dev/radio --- */

	case SAA6588_CMD_POLL:

		a->result = 0;

		a->poll_mask = 0;

		if (s->data_available_for_read)

			a->result |= EPOLLIN | EPOLLRDNORM;

			a->poll_mask |= EPOLLIN | EPOLLRDNORM;

		poll_wait(a->instance, &s->read_queue, a->event_list);

		break;

drivers/media/pci/bt8xx/bttv-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -3344,10 +3344,10 @@ static __poll_t radio_poll(struct file *file, poll_table *wait) 
	radio_enable(btv);

	cmd.instance = file;

	cmd.event_list = wait;

	cmd.result = res;

	cmd.poll_mask = res;

	bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);



	return cmd.result;

	return cmd.poll_mask;

}



static const struct v4l2_file_operations radio_fops =

drivers/media/pci/saa7134/saa7134-video.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,12 +1235,12 @@ static __poll_t radio_poll(struct file *file, poll_table *wait) 


	cmd.instance = file;

	cmd.event_list = wait;

	cmd.result = 0;

	cmd.poll_mask = 0;

	mutex_lock(&dev->lock);

	saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);

	mutex_unlock(&dev->lock);



	return rc | cmd.result;

	return rc | cmd.poll_mask;

}



/* ------------------------------------------------------------------ */

fs/ceph/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <linux/ceph/ceph_debug.h>



#include <linux/spinlock.h>

#include <linux/fs_struct.h>

#include <linux/namei.h>

#include <linux/slab.h>

#include <linux/sched.h>