TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

Browse Source 
Conflicts:
	fs/ocfs2/ocfs2.h
This commit is contained in:
Joel Becker
2010-10-15 13:03:09 -07:00
parent 7bdb0d18bf d4396eafe4
commit fc3718918f
764 changed files with 8226 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/fs.h
View File

@@ -1093,6 +1093,10 @@ struct file_lock {
#include <linux/fcntl.h>
/* temporary stubs for BKL removal */
#define lock_flocks() lock_kernel()
#define unlock_flocks() unlock_kernel()
extern void send_sigio(struct fown_struct *fown, int fd, int band);
#ifdef CONFIG_FILE_LOCKING