From 64f5164e457ad2ebc28ad1bc187492926cdcd431 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 23 Dec 2008 14:39:14 +0200 Subject: [PATCH] --- yaml --- r: 125479 b: refs/heads/master c: a9f2fc0e251e71a51deb8059b181c375a4a5e979 h: refs/heads/master i: 125477: 7e72c8cd24e9be94047c0c42b64e6d528efbd679 125475: 54a0dd5b87e42c0d86f961831f28cdf74876fffc 125471: cfaa8467b3bc449f5934f5d60206119ea01b5b00 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/ioctl.c | 2 ++ trunk/fs/ubifs/journal.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 261201a1b07a..090bdf5c6316 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f92b982680e4b4149c559789a54e1e9db190752a +refs/heads/master: a9f2fc0e251e71a51deb8059b181c375a4a5e979 diff --git a/trunk/fs/ubifs/ioctl.c b/trunk/fs/ubifs/ioctl.c index 5e82cffe9695..6db7a6be6c97 100644 --- a/trunk/fs/ubifs/ioctl.c +++ b/trunk/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/trunk/fs/ubifs/journal.c b/trunk/fs/ubifs/journal.c index 3b0fa704d559..10ae25b7d1db 100644 --- a/trunk/fs/ubifs/journal.c +++ b/trunk/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