git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fat: Cleanup nls_unload() usage
[pandora-kernel.git]
/
fs
/
fat
/
inode.c
diff --git
a/fs/fat/inode.c
b/fs/fat/inode.c
index
14da530
..
c611818
100644
(file)
--- a/
fs/fat/inode.c
+++ b/
fs/fat/inode.c
@@
-558,7
+558,7
@@
static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_bavail = sbi->free_clusters;
buf->f_fsid.val[0] = (u32)id;
buf->f_fsid.val[1] = (u32)(id >> 32);
buf->f_bavail = sbi->free_clusters;
buf->f_fsid.val[0] = (u32)id;
buf->f_fsid.val[1] = (u32)(id >> 32);
- buf->f_namelen = sbi->options.isvfat ?
260
: 12;
+ buf->f_namelen = sbi->options.isvfat ?
FAT_LFN_LEN
: 12;
return 0;
}
return 0;
}
@@
-577,7
+577,7
@@
static inline loff_t fat_i_pos_read(struct msdos_sb_info *sbi,
return i_pos;
}
return i_pos;
}
-static int fat_write_inode(struct inode *inode, int wait)
+static int
__
fat_write_inode(struct inode *inode, int wait)
{
struct super_block *sb = inode->i_sb;
struct msdos_sb_info *sbi = MSDOS_SB(sb);
{
struct super_block *sb = inode->i_sb;
struct msdos_sb_info *sbi = MSDOS_SB(sb);
@@
-634,9
+634,14
@@
retry:
return err;
}
return err;
}
+static int fat_write_inode(struct inode *inode, struct writeback_control *wbc)
+{
+ return __fat_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
+}
+
int fat_sync_inode(struct inode *inode)
{
int fat_sync_inode(struct inode *inode)
{
- return fat_write_inode(inode, 1);
+ return
__
fat_write_inode(inode, 1);
}
EXPORT_SYMBOL_GPL(fat_sync_inode);
}
EXPORT_SYMBOL_GPL(fat_sync_inode);
@@
-1492,10
+1497,8
@@
out_fail:
iput(fat_inode);
if (root_inode)
iput(root_inode);
iput(fat_inode);
if (root_inode)
iput(root_inode);
- if (sbi->nls_io)
- unload_nls(sbi->nls_io);
- if (sbi->nls_disk)
- unload_nls(sbi->nls_disk);
+ unload_nls(sbi->nls_io);
+ unload_nls(sbi->nls_disk);
if (sbi->options.iocharset != fat_default_iocharset)
kfree(sbi->options.iocharset);
sb->s_fs_info = NULL;
if (sbi->options.iocharset != fat_default_iocharset)
kfree(sbi->options.iocharset);
sb->s_fs_info = NULL;