diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-12-23 14:39:14 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-12-31 14:13:25 +0200 |
| commit | a9f2fc0e251e71a51deb8059b181c375a4a5e979 (patch) | |
| tree | cc4869e8325cf898554b05cc747c48b9d8ded800 /fs/ubifs | |
| parent | f92b982680e4b4149c559789a54e1e9db190752a (diff) | |
| download | kernel_samsung_crespo-a9f2fc0e251e71a51deb8059b181c375a4a5e979.zip kernel_samsung_crespo-a9f2fc0e251e71a51deb8059b181c375a4a5e979.tar.gz kernel_samsung_crespo-a9f2fc0e251e71a51deb8059b181c375a4a5e979.tar.bz2 | |
UBIFS: fix writing uncompressed files
UBIFS does not disable compression if ui->flags is non-zero, e.g.
if the file has "sync" flag. This is because of the typo which
is fixed by this patch. The patch also adds a couple of useful
debugging prints.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/ioctl.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/journal.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 5e82cff..6db7a6b 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -154,6 +154,7 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case FS_IOC_GETFLAGS: flags = ubifs2ioctl(ubifs_inode(inode)->flags); + dbg_gen("get flags: %#x, i_flags %#x", flags, inode->i_flags); return put_user(flags, (int __user *) arg); case FS_IOC_SETFLAGS: { @@ -176,6 +177,7 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) err = mnt_want_write(file->f_path.mnt); if (err) return err; + dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags); err = setflags(inode, flags); mnt_drop_write(file->f_path.mnt); return err; diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 3b0fa70..10ae25b 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -704,7 +704,7 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, data->size = cpu_to_le32(len); zero_data_node_unused(data); - if (!(ui->flags && UBIFS_COMPR_FL)) + if (!(ui->flags & UBIFS_COMPR_FL)) /* Compression is disabled for this inode */ compr_type = UBIFS_COMPR_NONE; else |