From 21d2925834b24cf708a354a4ee640750b79aface Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 28 Apr 2008 15:59:58 +0100
Subject: [PATCH] --- yaml --- r: 95600 b: refs/heads/master c:
 40a2159abf3d0107bba359246554bd7d56f2171b h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/acpi/video.c | 20 +++++++++-----------
 trunk/fs/sysfs/inode.c     |  2 ++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 2553fb8e25f3..dc4738c37f19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0066c4ea9ffa420cb79814411ff74fdc7b7d98e
+refs/heads/master: 40a2159abf3d0107bba359246554bd7d56f2171b
diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c
index 5e5dda3a3027..f7eb12e55602 100644
--- a/trunk/drivers/acpi/video.c
+++ b/trunk/drivers/acpi/video.c
@@ -1070,7 +1070,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
 	device_dir->owner = THIS_MODULE;
 
 	/* 'info' [R] */
-	entry = proc_create_data("info", S_IRUGO, device_dir,
+	entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
 			&acpi_video_device_info_fops, acpi_driver_data(device));
 	if (!entry)
 		goto err_remove_dir;
@@ -1078,7 +1078,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
 	/* 'state' [R/W] */
 	acpi_video_device_state_fops.write = acpi_video_device_write_state;
 	entry = proc_create_data("state", S_IFREG | S_IRUGO | S_IWUSR,
-				 device_dir,
+				 acpi_device_dir(device),
 				 &acpi_video_device_state_fops,
 				 acpi_driver_data(device));
 	if (!entry)
@@ -1088,21 +1088,19 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
 	acpi_video_device_brightness_fops.write =
 		acpi_video_device_write_brightness;
 	entry = proc_create_data("brightness", S_IFREG | S_IRUGO | S_IWUSR,
-				 device_dir,
+				 acpi_device_dir(device),
 				 &acpi_video_device_brightness_fops,
 				 acpi_driver_data(device));
 	if (!entry)
 		goto err_remove_state;
 
 	/* 'EDID' [R] */
-	entry = proc_create_data("EDID", S_IRUGO, device_dir,
+	entry = proc_create_data("EDID", S_IRUGO, acpi_device_dir(device),
 				 &acpi_video_device_EDID_fops,
 				 acpi_driver_data(device));
 	if (!entry)
 		goto err_remove_brightness;
 
-	acpi_device_dir(device) = device_dir;
-
 	return 0;
 
  err_remove_brightness:
@@ -1348,21 +1346,21 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
 	device_dir->owner = THIS_MODULE;
 
 	/* 'info' [R] */
-	entry = proc_create_data("info", S_IRUGO, device_dir,
+	entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
 				 &acpi_video_bus_info_fops,
 				 acpi_driver_data(device));
 	if (!entry)
 		goto err_remove_dir;
 
 	/* 'ROM' [R] */
-	entry = proc_create_data("ROM", S_IRUGO, device_dir,
+	entry = proc_create_data("ROM", S_IRUGO, acpi_device_dir(device),
 				 &acpi_video_bus_ROM_fops,
 				 acpi_driver_data(device));
 	if (!entry)
 		goto err_remove_info;
 
 	/* 'POST_info' [R] */
-	entry = proc_create_data("POST_info", S_IRUGO, device_dir,
+	entry = proc_create_data("POST_info", S_IRUGO, acpi_device_dir(device),
 				 &acpi_video_bus_POST_info_fops,
 				 acpi_driver_data(device));
 	if (!entry)
@@ -1371,7 +1369,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
 	/* 'POST' [R/W] */
 	acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
 	entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IWUSR,
-				 device_dir,
+				 acpi_device_dir(device),
 				 &acpi_video_bus_POST_fops,
 				 acpi_driver_data(device));
 	if (!entry)
@@ -1380,7 +1378,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
 	/* 'DOS' [R/W] */
 	acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
 	entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IWUSR,
-				 device_dir,
+				 acpi_device_dir(device),
 				 &acpi_video_bus_DOS_fops,
 				 acpi_driver_data(device));
 	if (!entry)
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index f8b82e73b3bf..eb53c632f856 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -59,6 +59,8 @@ int sysfs_setattr(struct dentry * dentry, struct iattr * iattr)
 	if (error)
 		return error;
 
+	iattr->ia_valid &= ~ATTR_SIZE; /* ignore size changes */
+
 	error = inode_setattr(inode, iattr);
 	if (error)
 		return error;