0/2 Unionfs updates/fixes/cleanups
Just two small changes.
Please pull from the 'master' branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/ezk/unionfs.git
to receive the following:
Erez Zadok (2):
Unionfs: use new umount_begin prototype
Unionfs: move fs/Makefile entry up to minimize merge conflicts
Makefile | 2 +- unionfs/super.c | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-)
Thanks.
---
Erez Zadok
[email protected]
PATCH 1/2 Unionfs: use new umount_begin prototype
Signed-off-by Erez Zadok <[email protected]>
--- fs/unionfs/super.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
fs/unionfs/super.c +4 -15
@@ -961,32 +961,21 @@ static int unionfs_write_inode(struct inode *inode, int sync)* Used only in nfs, to kill any pending RPC tasks, so that subsequent * code can actually succeed and won't leave tasks that need handling. */ -static void unionfs_umount_begin (struct vfsmount *mnt,int flags) +static void unionfs_umount_begin (struct super_block *sb) { -struct super_block *sb, *lower_sb; -struct vfsmount *lower_mnt; +struct super_block *lower_sb;int bindex, bstart, bend; -if (!(flags &MNT_FORCE )) -/* -* we are not being MNT_FORCE'd, therefore we should emulate -* old behavior -*/ -return ; - - sb = mnt->mnt_sb; -unionfs_read_lock (sb,UNIONFS_SMUTEX_CHILD ); bstart =sbstart (sb); bend =sbend (sb);for (bindex = bstart; bindex <= bend; bindex++) { - lower_mnt =unionfs_lower_mnt_idx (sb->s_root, bindex); lower_sb =unionfs_lower_super_idx (sb, bindex); -if (lower_mnt && lower_sb && lower_sb->s_op && +if (lower_sb && lower_sb->s_op && lower_sb->s_op->umount_begin) - lower_sb->s_op->umount_begin (lower_mnt, flags); + lower_sb->s_op->umount_begin (lower_sb); }unionfs_read_unlock (sb);
Signature · 1 line
1.5.2.2
PATCH 2/2 Unionfs: move fs/Makefile entry up to minimize merge conflicts
In reply to Erez ZadokSigned-off-by Erez Zadok <[email protected]>
--- fs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/Makefile +1 -1
@@ -85,6 +85,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ obj-$(CONFIG_HFS_FS) += hfs/ obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ +obj-$(CONFIG_UNION_FS) += unionfs/ obj-$(CONFIG_VXFS_FS) += freevxfs/ obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/
@@ -119,4 +120,3 @@ obj-$(CONFIG_HPPFS) += hppfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/ -obj-$(CONFIG_UNION_FS) += unionfs/
Signature · 1 line
1.5.2.2