Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dda2ac15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2ac04a15 e051fda4

fs/ocfs2/journal.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */