diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 11:31:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 11:31:01 -0500 |
| commit | b8a7f3cd7e8212e5c572178ff3b5a514861036a5 (patch) | |
| tree | f88fd0fc83a466a6d5781f90e7ed76cb2fa0f5d7 /arch | |
| parent | a377d181e65241344dd95aa4a42c477477be03f1 (diff) | |
| parent | eaff8079d4f1016a12e34ab323737314f24127dd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
kill I_LOCK
fold do_sync_file_range into sys_sync_file_range
fix up O_SYNC comments
VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr_all
vfs: remove extraneous NULL d_inode check from do_filp_open
fs: no games with DCACHE_UNHASHED
fs: anon_inodes implement dname
dio: fix use-after-free
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/include/asm/fcntl.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/fcntl.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/fcntl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h index 21b1117a0c61..70145cbb21cb 100644 --- a/arch/alpha/include/asm/fcntl.h +++ b/arch/alpha/include/asm/fcntl.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #define O_NOATIME 04000000 | 16 | #define O_NOATIME 04000000 |
| 17 | #define O_CLOEXEC 010000000 /* set close_on_exec */ | 17 | #define O_CLOEXEC 010000000 /* set close_on_exec */ |
| 18 | /* | 18 | /* |
| 19 | * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using | 19 | * Before Linux 2.6.33 only O_DSYNC semantics were implemented, but using |
| 20 | * the O_SYNC flag. We continue to use the existing numerical value | 20 | * the O_SYNC flag. We continue to use the existing numerical value |
| 21 | * for O_DSYNC semantics now, but using the correct symbolic name for it. | 21 | * for O_DSYNC semantics now, but using the correct symbolic name for it. |
| 22 | * This new value is used to request true Posix O_SYNC semantics. It is | 22 | * This new value is used to request true Posix O_SYNC semantics. It is |
diff --git a/arch/mips/include/asm/fcntl.h b/arch/mips/include/asm/fcntl.h index 7c6681aa2ab8..e482fe90fe88 100644 --- a/arch/mips/include/asm/fcntl.h +++ b/arch/mips/include/asm/fcntl.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #define FASYNC 0x1000 /* fcntl, for BSD compatibility */ | 19 | #define FASYNC 0x1000 /* fcntl, for BSD compatibility */ |
| 20 | #define O_LARGEFILE 0x2000 /* allow large file opens */ | 20 | #define O_LARGEFILE 0x2000 /* allow large file opens */ |
| 21 | /* | 21 | /* |
| 22 | * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using | 22 | * Before Linux 2.6.33 only O_DSYNC semantics were implemented, but using |
| 23 | * the O_SYNC flag. We continue to use the existing numerical value | 23 | * the O_SYNC flag. We continue to use the existing numerical value |
| 24 | * for O_DSYNC semantics now, but using the correct symbolic name for it. | 24 | * for O_DSYNC semantics now, but using the correct symbolic name for it. |
| 25 | * This new value is used to request true Posix O_SYNC semantics. It is | 25 | * This new value is used to request true Posix O_SYNC semantics. It is |
diff --git a/arch/sparc/include/asm/fcntl.h b/arch/sparc/include/asm/fcntl.h index 3b9cfb39175e..38f37b333cc7 100644 --- a/arch/sparc/include/asm/fcntl.h +++ b/arch/sparc/include/asm/fcntl.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #define O_NOATIME 0x200000 | 19 | #define O_NOATIME 0x200000 |
| 20 | #define O_CLOEXEC 0x400000 | 20 | #define O_CLOEXEC 0x400000 |
| 21 | /* | 21 | /* |
| 22 | * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using | 22 | * Before Linux 2.6.33 only O_DSYNC semantics were implemented, but using |
| 23 | * the O_SYNC flag. We continue to use the existing numerical value | 23 | * the O_SYNC flag. We continue to use the existing numerical value |
| 24 | * for O_DSYNC semantics now, but using the correct symbolic name for it. | 24 | * for O_DSYNC semantics now, but using the correct symbolic name for it. |
| 25 | * This new value is used to request true Posix O_SYNC semantics. It is | 25 | * This new value is used to request true Posix O_SYNC semantics. It is |