Sophie

Sophie

distrib > Mandriva > 8.2 > i586 > media > main-src > by-pkgid > 276c4c69ed5efcebe43ee6121194cf59 > files > 42

kernel22-2.2.20-9mdk.src.rpm

diff -urN lvm/drivers/block/lvm.c lvm-API/drivers/block/lvm.c
--- lvm/drivers/block/lvm.c	Wed Jan 10 02:56:01 2001
+++ lvm-API/drivers/block/lvm.c	Wed Jan 10 02:55:46 2001
@@ -153,7 +153,7 @@
 #define	DEVICE_OFF(device)
 
 /* lvm_do_lv_create calls fsync_dev_lockfs()/unlockfs() */
-/* #define	LVM_VFS_ENHANCEMENT */
+#define	LVM_VFS_ENHANCEMENT 
 
 #include <linux/version.h>
 
diff -urN lvm/fs/buffer.c lvm-API/fs/buffer.c
--- lvm/fs/buffer.c	Tue Jan  9 01:18:41 2001
+++ lvm-API/fs/buffer.c	Wed Jan 10 00:34:13 2001
@@ -303,6 +303,16 @@
 	return sync_buffers(dev, 1);
 }
 
+int fsync_dev_lockfs(kdev_t dev)
+{
+	sync_buffers(dev, 0);
+	sync_supers(dev);
+	sync_inodes(dev);
+	DQUOT_SYNC(dev);
+	sync_supers_lockfs(dev);
+	return sync_buffers(dev, 1);
+}
+
 asmlinkage int sys_sync(void)
 {
 	lock_kernel();
diff -urN lvm/fs/super.c lvm-API/fs/super.c
--- lvm/fs/super.c	Mon Dec 11 16:58:03 2000
+++ lvm-API/fs/super.c	Wed Jan 10 00:34:13 2001
@@ -460,6 +460,45 @@
 			sb->s_op->write_super(sb);
 	}
 }
+/*
+ * Note: don't check the dirty flag before waiting, we want the lock
+ * to happen every time we are called
+ */
+void sync_supers_lockfs(kdev_t dev)
+{
+	struct super_block * sb;
+
+	for (sb = sb_entry(super_blocks.next);
+	     sb != sb_entry(&super_blocks); 
+	     sb = sb_entry(sb->s_list.next)) {
+		if (!sb->s_dev)
+			continue;
+		if (dev && sb->s_dev != dev)
+			continue;
+		wait_on_super(sb);
+		if (!sb->s_dev) 
+			continue;
+		if (dev && (dev != sb->s_dev))
+			continue;
+		if (sb->s_op && sb->s_op->write_super_lockfs)
+			sb->s_op->write_super_lockfs(sb);
+	}
+}
+void unlockfs(kdev_t dev)
+{
+	struct super_block * sb;
+
+	for (sb = sb_entry(super_blocks.next);
+	     sb != sb_entry(&super_blocks); 
+	     sb = sb_entry(sb->s_list.next)) {
+		if (!sb->s_dev)
+			continue;
+		if (dev && sb->s_dev != dev)
+			continue;
+		if (sb->s_op && sb->s_op->unlockfs)
+			sb->s_op->unlockfs(sb);
+	}
+}
 
 struct super_block * get_super(kdev_t dev)
 {
diff -urN lvm/include/linux/fs.h lvm-API/include/linux/fs.h
--- lvm/include/linux/fs.h	Wed Jan 10 02:35:31 2001
+++ lvm-API/include/linux/fs.h	Wed Jan 10 02:35:35 2001
@@ -659,6 +659,8 @@
 	int (*remount_fs) (struct super_block *, int *, char *);
 	void (*clear_inode) (struct inode *);
 	void (*umount_begin) (struct super_block *);
+	void (*write_super_lockfs) (struct super_block *);
+	void (*unlockfs) (struct super_block *);
 };
 
 struct dquot_operations {
@@ -834,7 +836,10 @@
 extern void write_inode_now(struct inode *inode);
 extern void sync_dev(kdev_t dev);
 extern int fsync_dev(kdev_t dev);
+extern int fsync_dev_lockfs(kdev_t dev);
 extern void sync_supers(kdev_t dev);
+extern void sync_supers_lockfs(kdev_t dev);
+extern void unlockfs(kdev_t dev);
 extern int bmap(struct inode * inode,int block);
 extern int notify_change(struct dentry *, struct iattr *);
 extern int vfs_permission(struct inode * inode,int mask);
diff -urN lvm/kernel/ksyms.c lvm-API/kernel/ksyms.c
--- lvm/kernel/ksyms.c	Tue Jan  9 01:18:56 2001
+++ lvm-API/kernel/ksyms.c	Wed Jan 10 00:34:13 2001
@@ -170,6 +170,8 @@
 EXPORT_SYMBOL(invalidate_inode_pages);
 EXPORT_SYMBOL(truncate_inode_pages);
 EXPORT_SYMBOL(fsync_dev);
+EXPORT_SYMBOL(fsync_dev_lockfs);
+EXPORT_SYMBOL(unlockfs);
 EXPORT_SYMBOL(vfs_permission);
 EXPORT_SYMBOL(permission);
 EXPORT_SYMBOL(inode_setattr);