X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fnfs%2Fnamespace.c;h=acfc56f9edc04c53b25efaffeb80eb0ba9d887c5;hb=0fd5355470ea40355b8af76d01748ec7b9926d4d;hp=371b804e7cc8a66e2e6f20c00356799e5b6c51cc;hpb=dd8856bda5f1308beb113281b248683992998a9e;p=linux-2.6

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 371b804e7c..acfc56f9ed 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -155,12 +155,12 @@ out_follow:
 	goto out;
 }
 
-struct inode_operations nfs_mountpoint_inode_operations = {
+const struct inode_operations nfs_mountpoint_inode_operations = {
 	.follow_link	= nfs_follow_mountpoint,
 	.getattr	= nfs_getattr,
 };
 
-struct inode_operations nfs_referral_inode_operations = {
+const struct inode_operations nfs_referral_inode_operations = {
 	.follow_link	= nfs_follow_mountpoint,
 };
 
@@ -175,10 +175,8 @@ static void nfs_expire_automounts(struct work_struct *work)
 
 void nfs_release_automount_timer(void)
 {
-	if (list_empty(&nfs_automount_list)) {
+	if (list_empty(&nfs_automount_list))
 		cancel_delayed_work(&nfs_automount_task);
-		flush_scheduled_work();
-	}
 }
 
 /*