aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 22:04:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 22:04:21 -0400
commit9c125d2af8f4d06ea62a4d8ff100af392a0a3a3b (patch)
treea8ba80d7d5c9385d4b8624a9cee9b9cebc5f1382 /fs
parent40182373ac6cbbd10c6d08ba339947eea009d513 (diff)
parent1adffbae22332bb558c2a29de19d9aca391869f6 (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: Fix corrupt inode flags when remove ATTR_SYS flag
Diffstat (limited to 'fs')
-rw-r--r--fs/fat/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 7257752b6d5..7018e1d8902 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -102,7 +102,7 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr)
102 if (attr & ATTR_SYS) 102 if (attr & ATTR_SYS)
103 inode->i_flags |= S_IMMUTABLE; 103 inode->i_flags |= S_IMMUTABLE;
104 else 104 else
105 inode->i_flags &= S_IMMUTABLE; 105 inode->i_flags &= ~S_IMMUTABLE;
106 } 106 }
107 107
108 fat_save_attrs(inode, attr); 108 fat_save_attrs(inode, attr);