diff options
| author | Linus Torvalds | 2006-06-25 19:54:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-06-25 19:54:14 +0200 |
| commit | 1d77062b1402aef5b26e1d3776991126e8026bde (patch) | |
| tree | 96e4da18878f5fb2ae50b260e194b78803d4c7a9 /fs/fuse/inode.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
| download | kernel-qcow2-linux-1d77062b1402aef5b26e1d3776991126e8026bde.tar.gz kernel-qcow2-linux-1d77062b1402aef5b26e1d3776991126e8026bde.tar.xz kernel-qcow2-linux-1d77062b1402aef5b26e1d3776991126e8026bde.zip | |
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
...
Diffstat (limited to 'fs/fuse/inode.c')
| -rw-r--r-- | fs/fuse/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 5ceb8bd7a189..dcaaabd3b9c4 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -198,9 +198,10 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid, return inode; } -static void fuse_umount_begin(struct super_block *sb) +static void fuse_umount_begin(struct vfsmount *vfsmnt, int flags) { - fuse_abort_conn(get_fuse_conn_super(sb)); + if (flags & MNT_FORCE) + fuse_abort_conn(get_fuse_conn_super(vfsmnt->mnt_sb)); } static void fuse_put_super(struct super_block *sb) |