aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fat/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 14:29:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 14:29:44 -0400
commit23059a0df5fad3d83b9a21fc2696a39148f49617 (patch)
treec23275fb1d4f6b4990d38c01344770c2d10f8e71 /fs/fat/dir.c
parent4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (diff)
parent21bea495943f9532f16e819066b340762124f5dd (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: split fat_generic_ioctl FAT: add 'errors' mount option
Diffstat (limited to 'fs/fat/dir.c')
-rw-r--r--fs/fat/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index f3500294eec5..3b8e71b412fd 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -1334,7 +1334,7 @@ found:
1334 goto error_remove; 1334 goto error_remove;
1335 } 1335 }
1336 if (dir->i_size & (sbi->cluster_size - 1)) { 1336 if (dir->i_size & (sbi->cluster_size - 1)) {
1337 fat_fs_panic(sb, "Odd directory size"); 1337 fat_fs_error(sb, "Odd directory size");
1338 dir->i_size = (dir->i_size + sbi->cluster_size - 1) 1338 dir->i_size = (dir->i_size + sbi->cluster_size - 1)
1339 & ~((loff_t)sbi->cluster_size - 1); 1339 & ~((loff_t)sbi->cluster_size - 1);
1340 } 1340 }