diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 15:50:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 15:50:52 -0700 |
| commit | 93912fe69d67597ee4c0b451d24539ead550bdc3 (patch) | |
| tree | d12729aa17d43d0e8010d7ff3d6a0ef7ad70f304 /fs/ubifs/dir.c | |
| parent | 0ec4f431eb56d633da3a55da67d5c4b88886ccc7 (diff) | |
| parent | 7074e5eb233343e4bad8c0a3f9e73167cf85a159 (diff) | |
| download | op-kernel-dev-93912fe69d67597ee4c0b451d24539ead550bdc3.zip op-kernel-dev-93912fe69d67597ee4c0b451d24539ead550bdc3.tar.gz | |
Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubifs
Pull UBIFS updates from Artem Bityutskiy:
- Added another debugfs knob for forcing UBIFS R/O mode without
flushing caches or finishing commit or any other I/O operation. I've
originally added this knob in order to reproduce the free space fixup
bug (see commit c6727932cfdb: "UBIFS: fix a bug in empty space
fix-up") on nandsim.
Without this knob I would have to do real power-cuts, which would
make debugging much harder. Then I've decided to keep this knob
because it is also useful for UBIFS power-cut recovery end
error-paths testing.
- Well-spotted fix from Julia. This bug did not cause real troubles
for UBIFS, but nevertheless it could cause issues for someone trying
to modify the orphans handling code. Kudos to coccinelle!
- Minor cleanups.
* tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubifs:
UBIFS: remove invalid reference to list iterator variable
UBIFS: simplify reply code a bit
UBIFS: add debugfs knob to switch to R/O mode
UBIFS: fix compilation warning
Diffstat (limited to 'fs/ubifs/dir.c')
| -rw-r--r-- | fs/ubifs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index b1cca89..c95681c 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -969,7 +969,7 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, struct ubifs_budget_req ino_req = { .dirtied_ino = 1, .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) }; struct timespec time; - unsigned int saved_nlink; + unsigned int uninitialized_var(saved_nlink); /* * Budget request settings: deletion direntry, new direntry, removing |
