Merge commit 'v2.6.26' into bkl-removal

[linux-2.6-omap-h63xx.git] / fs / fat / file.c

diff --git a/fs/fat/file.c b/fs/fat/file.c
index 771326b8047e0ff5e3483f885c1edc30a604471a..c672df4036e94cc59aed3c1c59b4fdeb8882fe7a 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -11,7 +11,6 @@
 #include <linux/mount.h>
 #include <linux/time.h>
 #include <linux/msdos_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/writeback.h>
 #include <linux/backing-dev.h>
@@ -242,9 +241,7 @@ void fat_truncate(struct inode *inode)
 
        nr_clusters = (inode->i_size + (cluster_size - 1)) >> sbi->cluster_bits;
 
-       lock_kernel();
        fat_free(inode, nr_clusters);
-       unlock_kernel();
        fat_flush_inodes(inode->i_sb, inode, NULL);
 }
 
@@ -310,8 +307,6 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)
        int error = 0;
        unsigned int ia_valid;
 
-       lock_kernel();
-
        /*
         * Expand the file. Since inode_setattr() updates ->i_size
         * before calling the ->truncate(), but FAT needs to fill the
@@ -366,7 +361,6 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)
 
        error = inode_setattr(inode, attr);
 out:
-       unlock_kernel();
        return error;
 }
 EXPORT_SYMBOL_GPL(fat_setattr);