LVM2/lib/device dev-io.c

LVM2/lib/device dev-io.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk at sourceware.org	2010-04-01 14:30:52

Modified files:
	lib/device     : dev-io.c 

Log message:
	temporarily downgrade the 'open while suspended' error till we fix it properly

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/device/dev-io.c.diff?cvsroot=lvm2&r1=1.66&r2=1.67

--- LVM2/lib/device/dev-io.c	2010/04/01 10:34:10	1.66
+++ LVM2/lib/device/dev-io.c	2010/04/01 14:30:51	1.67
@@ -392,7 +392,8 @@
 	}
 
 	if (memlock())
-		log_error(INTERNAL_ERROR "dev_open(%s) called while suspended",
+		/* FIXME Make this log_error */
+		log_verbose("dev_open(%s) called while suspended",
 			 dev_name(dev));
 
 	if (dev->flags & DEV_REGULAR)

LVM2/lib/device dev-io.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk at sourceware.org	2010-09-27 19:15:13

Modified files:
	lib/device     : dev-io.c 

Log message:
	drop an unnecessary 'stack'

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/device/dev-io.c.diff?cvsroot=lvm2&r1=1.70&r2=1.71

--- LVM2/lib/device/dev-io.c	2010/09/22 22:31:46	1.70
+++ LVM2/lib/device/dev-io.c	2010/09/27 19:15:13	1.71
@@ -210,8 +210,10 @@
 		       (size_t) where->size);
 
 		/* ... then we write */
-		r = _io(&widened, bounce, 1);
-		goto_out;
+		if (!(r = _io(&widened, bounce, 1)))
+			stack;
+			
+		goto out;
 	}
 
 	memcpy(buffer, bounce + (where->start - widened.start),

LVM2/lib/device dev-io.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac at sourceware.org	2012-02-08 11:15:38

Modified files:
	lib/device     : dev-io.c 

Log message:
	Move close few lines
	
	Since the function dev_close() has code path, which really could close
	file (for unlocked vg) and destroy dev handler, stay on safe side and move
	the close few lines later, even our current use case shouldn't trigger
	such scenario.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/device/dev-io.c.diff?cvsroot=lvm2&r1=1.79&r2=1.80

--- LVM2/lib/device/dev-io.c	2011/12/21 13:24:25	1.79
+++ LVM2/lib/device/dev-io.c	2012/02/08 11:15:38	1.80
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -292,15 +292,15 @@
 		return 0;
 	}
 
-	if (!dev_close(dev))
-		stack;
-
 	*read_ahead = (uint32_t) read_ahead_long;
 	dev->read_ahead = read_ahead_long;
 
 	log_very_verbose("%s: read_ahead is %u sectors",
 			 dev_name(dev), *read_ahead);
 
+	if (!dev_close(dev))
+		stack;
+
 	return 1;
 }