Commit 11fbf53d 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 bits and pieces from various people. No common topic in this
  pile, sorry"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs/affs: add rename exchange
  fs/affs: add rename2 to prepare multiple methods
  Make stat/lstat/fstatat pass AT_NO_AUTOMOUNT to vfs_statx()
  fs: don't set *REFERENCED on single use objects
  fs: compat: Remove warning from COMPATIBLE_IOCTL
  remove pointless extern of atime_need_update_rcu()
  fs: completely ignore unknown open flags
  fs: add a VALID_OPEN_FLAGS
  fs: remove _submit_bh()
  fs: constify tree_descr arrays passed to simple_fill_super()
  fs: drop duplicate header percpu-rwsem.h
  fs/affs: bugfix: Write files greater than page size on OFS
  fs/affs: bugfix: enable writes on OFS disks
  fs/affs: remove node generation check
  fs/affs: import amigaffs.h
  fs/affs: bugfix: make symbolic links work again
parents 339fbf67 6b465766

drivers/infiniband/hw/qib/qib_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static int qibfs_fill_super(struct super_block *sb, void *data, int silent) 
	unsigned long flags;

	int ret;



	static struct tree_descr files[] = {

	static const struct tree_descr files[] = {

		[2] = {"driver_stats", &driver_ops[0], S_IRUGO},

		[3] = {"driver_stats_names", &driver_ops[1], S_IRUGO},

		{""},

drivers/xen/xenfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ static const struct file_operations capabilities_file_ops = { 


static int xenfs_fill_super(struct super_block *sb, void *data, int silent)

{

	static struct tree_descr xenfs_files[] = {

	static const struct tree_descr xenfs_files[] = {

		[2] = { "xenbus", &xen_xenbus_fops, S_IRUSR|S_IWUSR },

		{ "capabilities", &capabilities_file_ops, S_IRUGO },

		{ "privcmd", &xen_privcmd_fops, S_IRUSR|S_IWUSR },

		{""},

	};



	static struct tree_descr xenfs_init_files[] = {

	static const struct tree_descr xenfs_init_files[] = {

		[2] = { "xenbus", &xen_xenbus_fops, S_IRUSR|S_IWUSR },

		{ "capabilities", &capabilities_file_ops, S_IRUGO },

		{ "privcmd", &xen_privcmd_fops, S_IRUSR|S_IWUSR },

fs/affs/affs.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/types.h>

#include <linux/fs.h>

#include <linux/buffer_head.h>

#include <linux/amigaffs.h>

#include "amigaffs.h"

#include <linux/mutex.h>

#include <linux/workqueue.h>
@@ -173,7 +173,7 @@ extern int affs_link(struct dentry *olddentry, struct inode *dir, 
			  struct dentry *dentry);

extern int	affs_symlink(struct inode *dir, struct dentry *dentry,

			     const char *symname);

extern int	affs_rename(struct inode *old_dir, struct dentry *old_dentry,

extern int	affs_rename2(struct inode *old_dir, struct dentry *old_dentry,

			    struct inode *new_dir, struct dentry *new_dentry,

			    unsigned int flags);

include/linux/amigaffs.h→fs/affs/amigaffs.h

+0 −0

File moved.

View file

fs/affs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ const struct inode_operations affs_dir_inode_operations = { 
	.symlink	= affs_symlink,

	.mkdir		= affs_mkdir,

	.rmdir		= affs_rmdir,

	.rename		= affs_rename,

	.rename		= affs_rename2,

	.setattr	= affs_notify_change,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE