Commit 1d77062b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (51 commits)
  nfs: remove nfs_put_link()
  nfs-build-fix-99
  git-nfs-build-fixes
  Merge branch 'odirect'
  NFS: alloc nfs_read/write_data as direct I/O is scheduled
  NFS: Eliminate nfs_get_user_pages()
  NFS: refactor nfs_direct_free_user_pages
  NFS: remove user_addr, user_count, and pos from nfs_direct_req
  NFS: "open code" the NFS direct write rescheduler
  NFS: Separate functions for counting outstanding NFS direct I/Os
  NLM: Fix reclaim races
  NLM: sem to mutex conversion
  locks.c: add the fl_owner to nlm_compare_locks
  NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts
  NFS: Split fs/nfs/inode.c
  NFS: Fix typo in nfs_do_clone_mount()
  NFS: Fix compile errors introduced by referrals patches
  NFSv4: Ensure that referral mounts bind to a reserved port
  NFSv4: A root pathname is sent as a zero component4
  NFSv4: Follow a referral
  ...
parents 25581ad1 76a9f26c

Documentation/filesystems/automount-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ following procedure: 


 (2) Have the follow_link() op do the following steps:



     (a) Call do_kern_mount() to call the appropriate filesystem to set up a

     (a) Call vfs_kern_mount() to call the appropriate filesystem to set up a

         superblock and gain a vfsmount structure representing it.



     (b) Copy the nameidata provided as an argument and substitute the dentry

drivers/usb/core/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int create_special_files (void) 
	ignore_mount = 1;



	/* create the devices special file */

	retval = simple_pin_fs("usbfs", &usbfs_mount, &usbfs_mount_count);

	retval = simple_pin_fs(&usb_fs_type, &usbfs_mount, &usbfs_mount_count);

	if (retval) {

		err ("Unable to get usbfs mount");

		goto exit;

fs/9p/vfs_super.c

+4 −3
Original line number Diff line number Diff line
@@ -256,10 +256,11 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt) 
}



static void

v9fs_umount_begin(struct super_block *sb)

v9fs_umount_begin(struct vfsmount *vfsmnt, int flags)

{

	struct v9fs_session_info *v9ses = sb->s_fs_info;

	struct v9fs_session_info *v9ses = vfsmnt->mnt_sb->s_fs_info;



	if (flags & MNT_FORCE)

		v9fs_session_cancel(v9ses);

}

fs/afs/mntpt.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) 


	/* try and do the mount */

	kdebug("--- attempting mount %s -o %s ---", devname, options);

	mnt = do_kern_mount("afs", 0, devname, options);

	mnt = vfs_kern_mount(&afs_fs_type, 0, devname, options);

	kdebug("--- mount result %p ---", mnt);



	free_page((unsigned long) devname);

fs/afs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void afs_put_super(struct super_block *sb); 


static void afs_destroy_inode(struct inode *inode);



static struct file_system_type afs_fs_type = {

struct file_system_type afs_fs_type = {

	.owner		= THIS_MODULE,

	.name		= "afs",

	.get_sb		= afs_get_sb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE