diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:59:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:59:27 -0800 |
| commit | dda2ac15d23b38e4335e858848aa8c9a6710304f (patch) | |
| tree | 8862ea96194611bc1ab6c96726e38ba0d4772c3a /fs | |
| parent | 2ac04a1597d9bca952dafcf8cbff4621884cb723 (diff) | |
| parent | e051fda4fd14fe878e6d2183b3a4640febe9e9a8 (diff) | |
| download | kernel_samsung_smdk4412-dda2ac15d23b38e4335e858848aa8c9a6710304f.tar.gz kernel_samsung_smdk4412-dda2ac15d23b38e4335e858848aa8c9a6710304f.tar.bz2 kernel_samsung_smdk4412-dda2ac15d23b38e4335e858848aa8c9a6710304f.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: ocfs2_link() journal credits update
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/journal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index e1216364d19..d026b4f2775 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h @@ -306,8 +306,8 @@ int ocfs2_journal_dirty_data(handle_t *handle, * for the dinode, one for the new block. */ #define OCFS2_SIMPLE_DIR_EXTEND_CREDITS (2) -/* file update (nlink, etc) + dir entry block */ -#define OCFS2_LINK_CREDITS (OCFS2_INODE_UPDATE_CREDITS + 1) +/* file update (nlink, etc) + directory mtime/ctime + dir entry block */ +#define OCFS2_LINK_CREDITS (2*OCFS2_INODE_UPDATE_CREDITS + 1) /* inode + dir inode (if we unlink a dir), + dir entry block + orphan * dir inode link */ |