Commit 4b4f1d01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (87 commits)
  nilfs2: get rid of bd_mount_sem use from nilfs
  nilfs2: correct exclusion control in nilfs_remount function
  nilfs2: simplify remaining sget() use
  nilfs2: get rid of sget use for checking if current mount is present
  nilfs2: get rid of sget use for acquiring nilfs object
  nilfs2: remove meaningless EBUSY case from nilfs_get_sb function
  remove the call to ->write_super in __sync_filesystem
  nilfs2: call nilfs2_write_super from nilfs2_sync_fs
  jffs2: call jffs2_write_super from jffs2_sync_fs
  ufs: add ->sync_fs
  sysv: add ->sync_fs
  hfsplus: add ->sync_fs
  hfs: add ->sync_fs
  fat: add ->sync_fs
  ext2: add ->sync_fs
  exofs: add ->sync_fs
  bfs: add ->sync_fs
  affs: add ->sync_fs
  sanitize ->fsync() for affs
  repair bfs_write_inode(), switch bfs to simple_fsync()
  ...
parents 875287ca aa7dfb89

arch/alpha/kernel/osf_sys.c

+0 −3
Original line number Diff line number Diff line
@@ -371,8 +371,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path, 
	int retval = -EINVAL;

	char *name;



	lock_kernel();



	name = getname(path);

	retval = PTR_ERR(name);

	if (IS_ERR(name))
@@ -392,7 +390,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path, 
	}

	putname(name);

 out:

	unlock_kernel();

	return retval;

}

drivers/ieee1394/dv1394.c

+3 −2
Original line number Diff line number Diff line
@@ -1789,12 +1789,13 @@ static int dv1394_open(struct inode *inode, struct file *file) 
	} else {

		/* look up the card by ID */

		unsigned long flags;

		int idx = ieee1394_file_to_instance(file);



		spin_lock_irqsave(&dv1394_cards_lock, flags);

		if (!list_empty(&dv1394_cards)) {

			struct video_card *p;

			list_for_each_entry(p, &dv1394_cards, list) {

				if ((p->id) == ieee1394_file_to_instance(file)) {

				if ((p->id) == idx) {

					video = p;

					break;

				}
@@ -1803,7 +1804,7 @@ static int dv1394_open(struct inode *inode, struct file *file) 
		spin_unlock_irqrestore(&dv1394_cards_lock, flags);



		if (!video) {

			debug_printk("dv1394: OHCI card %d not found", ieee1394_file_to_instance(file));

			debug_printk("dv1394: OHCI card %d not found", idx);

			return -ENODEV;

		}

drivers/ieee1394/ieee1394_core.h

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

#include <linux/list.h>

#include <linux/types.h>

#include <linux/cdev.h>

#include <asm/atomic.h>



#include "hosts.h"
@@ -155,7 +156,10 @@ void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size, 
 */

static inline unsigned char ieee1394_file_to_instance(struct file *file)

{

	return file->f_path.dentry->d_inode->i_cindex;

	int idx = cdev_index(file->f_path.dentry->d_inode);

	if (idx < 0)

		idx = 0;

	return idx;

}



extern int hpsb_disable_irm;

drivers/usb/core/inode.c

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/parser.h>

#include <linux/notifier.h>

#include <linux/seq_file.h>

#include <linux/smp_lock.h>

#include <asm/byteorder.h>

#include "usb.h"

#include "hcd.h"
@@ -265,9 +266,13 @@ static int remount(struct super_block *sb, int *flags, char *data) 
		return -EINVAL;

	}



	lock_kernel();



	if (usbfs_mount && usbfs_mount->mnt_sb)

		update_sb(usbfs_mount->mnt_sb);



	unlock_kernel();



	return 0;

}

fs/adfs/adfs.h

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct adfs_dir_ops { 
	int	(*update)(struct adfs_dir *dir, struct object_info *obj);

	int	(*create)(struct adfs_dir *dir, struct object_info *obj);

	int	(*remove)(struct adfs_dir *dir, struct object_info *obj);

	int	(*sync)(struct adfs_dir *dir);

	void	(*free)(struct adfs_dir *dir);

};
@@ -90,7 +91,8 @@ extern const struct dentry_operations adfs_dentry_operations; 
extern struct adfs_dir_ops adfs_f_dir_ops;

extern struct adfs_dir_ops adfs_fplus_dir_ops;



extern int adfs_dir_update(struct super_block *sb, struct object_info *obj);

extern int adfs_dir_update(struct super_block *sb, struct object_info *obj,

			   int wait);



/* file.c */

extern const struct inode_operations adfs_file_inode_operations;

CRA Git | Maintained and supported by SUSTech CRA and CCSE