Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Increment the reference count of an already-active stack.
  [PATCH] configfs: Consolidate locking around configfs_detach_prep() in configfs_rmdir()
  ocfs2: correctly set i_blocks after inline dir gets expanded
  ocfs2: Jump to correct label in ocfs2_expand_inline_dir()
  ocfs2: Fix sleep-with-spinlock recovery regression
  [PATCH] ocfs2/cluster/netdebug.c: fix warning
  [PATCH] ocfs2/cluster/tcp.c: make some functions static

...

This commit is contained in:

Linus Torvalds 2008-08-27 13:54:55 -07:00

parent 72e19b3b22 d6817cdbd1

commit e472233fc5

7 changed files with 83 additions and 77 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

fs/configfs/dir.c

View file

26

fs/ocfs2/cluster/netdebug.c

View file

44

fs/ocfs2/cluster/tcp.c

View file

32

fs/ocfs2/cluster/tcp_internal.h

View file

11

fs/ocfs2/dir.c

View file

23

fs/ocfs2/journal.c

View file

7

fs/ocfs2/stackglue.c

View file