From 5b4bd75bdb95865169d2c02b3e5ffcbac44b4911 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 24 Nov 2013 01:31:38 -0500 Subject: [PATCH] Uniofs: port to 3.5 Signed-off-by: Erez Zadok --- MAINTAINERS | 16 ++++++++-------- fs/unionfs/file.c | 5 +++-- fs/unionfs/super.c | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3d470a550d2..1d9af4b7863 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6975,14 +6975,6 @@ F: Documentation/cdrom/ F: drivers/cdrom/cdrom.c F: include/linux/cdrom.h -UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER -M: Vinayak Holikatti -M: Santosh Y -L: linux-scsi@vger.kernel.org -S: Supported -F: Documentation/scsi/ufs.txt -F: drivers/scsi/ufs/ - UNION FILE SYSTEM P: Erez Zadok M: ezk@cs.sunysb.edu @@ -6993,6 +6985,14 @@ S: Maintained F: Documentation/filesystems/unionfs/ F: fs/unionfs/ +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER +M: Vinayak Holikatti +M: Santosh Y +L: linux-scsi@vger.kernel.org +S: Supported +F: Documentation/scsi/ufs.txt +F: drivers/scsi/ufs/ + UNSORTED BLOCK IMAGES (UBI) M: Artem Bityutskiy W: http://www.linux-mtd.infradead.org/ diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c index f583c8fc5a2..8a04063930e 100644 --- a/fs/unionfs/file.c +++ b/fs/unionfs/file.c @@ -156,8 +156,9 @@ static int unionfs_mmap(struct file *file, struct vm_area_struct *vma) goto out; } saved_vm_ops = vma->vm_ops; - err = do_munmap(current->mm, vma->vm_start, - vma->vm_end - vma->vm_start); + up_write(¤t->mm->mmap_sem); /* VFS already holds sema... */ + err = vm_munmap(vma->vm_start, vma->vm_end - vma->vm_start); + down_write(¤t->mm->mmap_sem); if (err) { printk(KERN_ERR "unionfs: do_munmap failed %d\n", err); goto out; diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c index b99f14d1c74..53d289b19c3 100644 --- a/fs/unionfs/super.c +++ b/fs/unionfs/super.c @@ -835,7 +835,7 @@ static void unionfs_evict_inode(struct inode *inode) struct unionfs_dir_state *rdstate; truncate_inode_pages(&inode->i_data, 0); - end_writeback(inode); + clear_inode(inode); list_for_each_safe(pos, n, &UNIONFS_I(inode)->readdircache) { rdstate = list_entry(pos, struct unionfs_dir_state, cache); -- 2.43.0