X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Ffat%2Fdir.c;h=4095bc149eb12ee182cf11a8b409a37e537d29d0;hb=4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99;hp=eef1b81aa294d8a8f82686030edea5ca006ce320;hpb=0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3;p=linux-2.6-omap-h63xx.git

diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index eef1b81aa29..4095bc149eb 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -114,7 +114,7 @@ static inline int fat_get_entry(struct inode *dir, loff_t *pos,
 }
 
 /*
- * Convert Unicode 16 to UTF8, translated Unicode, or ASCII.
+ * Convert Unicode 16 to UTF-8, translated Unicode, or ASCII.
  * If uni_xlate is enabled and we can't get a 1:1 conversion, use a
  * colon as an escape character since it is normally invalid on the vfat
  * filesystem. The following four characters are the hexadecimal digits
@@ -729,13 +729,13 @@ static int fat_dir_ioctl(struct inode * inode, struct file * filp,
 
 	buf.dirent = d1;
 	buf.result = 0;
-	down(&inode->i_sem);
+	mutex_lock(&inode->i_mutex);
 	ret = -ENOENT;
 	if (!IS_DEADDIR(inode)) {
 		ret = __fat_readdir(inode, filp, &buf, fat_ioctl_filldir,
 				    short_only, both);
 	}
-	up(&inode->i_sem);
+	mutex_unlock(&inode->i_mutex);
 	if (ret >= 0)
 		ret = buf.result;
 	return ret;