From 04b88d5f692b0d041029d7cb8131ff79f5160d21 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Wed, 20 Oct 2010 17:42:44 +0200
Subject: [PATCH] --- yaml --- r: 229143 b: refs/heads/master c:
 49521de119d326d04fb3736ab827e12e1de966d0 h: refs/heads/master i:   229141:
 05714ec1520bd834138311bd13ef7231a4ccf8cd   229139:
 f961ffe5cd31b242bf093018caeb456467fb57fd   229135:
 eaf3378b20b73ed126f6ebbdc0710ede655bfe07 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/udf/inode.c   | 13 +++----------
 trunk/fs/udf/udfdecl.h |  1 -
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 115fe3516166..8f11c1ee339d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a6cc1f146465e13f31d9163d542d1facf4e203
+refs/heads/master: 49521de119d326d04fb3736ab827e12e1de966d0
diff --git a/trunk/fs/udf/inode.c b/trunk/fs/udf/inode.c
index fc48f37aa2dd..9656907f4b81 100644
--- a/trunk/fs/udf/inode.c
+++ b/trunk/fs/udf/inode.c
@@ -51,6 +51,7 @@ MODULE_LICENSE("GPL");
 static mode_t udf_convert_permissions(struct fileEntry *);
 static int udf_update_inode(struct inode *, int);
 static void udf_fill_inode(struct inode *, struct buffer_head *);
+static int udf_sync_inode(struct inode *inode);
 static int udf_alloc_i_data(struct inode *inode, size_t size);
 static struct buffer_head *inode_getblk(struct inode *, sector_t, int *,
 					sector_t *, int *);
@@ -79,9 +80,7 @@ void udf_evict_inode(struct inode *inode)
 		want_delete = 1;
 		inode->i_size = 0;
 		udf_truncate(inode);
-		lock_kernel();
 		udf_update_inode(inode, IS_SYNC(inode));
-		unlock_kernel();
 	}
 	invalidate_inode_buffers(inode);
 	end_writeback(inode);
@@ -1373,16 +1372,10 @@ static mode_t udf_convert_permissions(struct fileEntry *fe)
 
 int udf_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
-	int ret;
-
-	lock_kernel();
-	ret = udf_update_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
-	unlock_kernel();
-
-	return ret;
+	return udf_update_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
 }
 
-int udf_sync_inode(struct inode *inode)
+static int udf_sync_inode(struct inode *inode)
 {
 	return udf_update_inode(inode, 1);
 }
diff --git a/trunk/fs/udf/udfdecl.h b/trunk/fs/udf/udfdecl.h
index 74d58c08ebac..f25e57e8a777 100644
--- a/trunk/fs/udf/udfdecl.h
+++ b/trunk/fs/udf/udfdecl.h
@@ -135,7 +135,6 @@ extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *,
 extern long udf_ioctl(struct file *, unsigned int, unsigned long);
 /* inode.c */
 extern struct inode *udf_iget(struct super_block *, struct kernel_lb_addr *);
-extern int udf_sync_inode(struct inode *);
 extern void udf_expand_file_adinicb(struct inode *, int, int *);
 extern struct buffer_head *udf_expand_dir_adinicb(struct inode *, int *, int *);
 extern struct buffer_head *udf_bread(struct inode *, int, int, int *);