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

Commit 3126c136 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (21 commits)
  ext3: PTR_ERR return of wrong pointer in setup_new_group_blocks()
  ext3: Fix data / filesystem corruption when write fails to copy data
  ext4: Support for 64-bit quota format
  ext3: Support for vfsv1 quota format
  quota: Implement quota format with 64-bit space and inode limits
  quota: Move definition of QFMT_OCFS2 to linux/quota.h
  ext2: fix comment in ext2_find_entry about return values
  ext3: Unify log messages in ext3
  ext2: clear uptodate flag on super block I/O error
  ext2: Unify log messages in ext2
  ext3: make "norecovery" an alias for "noload"
  ext3: Don't update the superblock in ext3_statfs()
  ext3: journal all modifications in ext3_xattr_set_handle
  ext2: Explicitly assign values to on-disk enum of filetypes
  quota: Fix WARN_ON in lookup_one_len
  const: struct quota_format_ops
  ubifs: remove manual O_SYNC handling
  afs: remove manual O_SYNC handling
  kill wait_on_page_writeback_range
  vfs: Implement proper O_SYNC semantics
  ...
parents f4d544ee 8e0eb401

Documentation/filesystems/ext3.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ journal_dev=devnum When the external journal device's major/minor numbers 
			identified through its new major/minor numbers encoded

			in devnum.



noload			Don't load the journal on mounting. Note that this forces

			mount of inconsistent filesystem, which can lead to

norecovery		Don't load the journal on mounting. Note that this forces

noload			mount of inconsistent filesystem, which can lead to

			various problems.



data=journal		All data are committed into the journal prior to being

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ __sync_single_inode) to check if ->writepages has been successful in 
writing out the whole address_space.



The Writeback tag is used by filemap*wait* and sync_page* functions,

via wait_on_page_writeback_range, to wait for all writeback to

via filemap_fdatawait_range, to wait for all writeback to

complete.  While waiting ->sync_page (if defined) will be called on

each page that is found to require writeback.

arch/alpha/include/asm/fcntl.h

+16 −3
Original line number Diff line number Diff line 
#ifndef _ALPHA_FCNTL_H

#define _ALPHA_FCNTL_H



/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_CREAT		 01000	/* not fcntl */

#define O_TRUNC		 02000	/* not fcntl */

#define O_EXCL		 04000	/* not fcntl */
@@ -10,13 +8,28 @@ 


#define O_NONBLOCK	 00004

#define O_APPEND	 00010

#define O_SYNC		040000

#define O_DSYNC		040000	/* used to be O_SYNC, see below */

#define O_DIRECTORY	0100000	/* must be a directory */

#define O_NOFOLLOW	0200000 /* don't follow links */

#define O_LARGEFILE	0400000 /* will be set by the kernel on every open */

#define O_DIRECT	02000000 /* direct disk access - should check with OSF/1 */

#define O_NOATIME	04000000

#define O_CLOEXEC	010000000 /* set close_on_exec */

/*

 * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using

 * the O_SYNC flag.  We continue to use the existing numerical value

 * for O_DSYNC semantics now, but using the correct symbolic name for it.

 * This new value is used to request true Posix O_SYNC semantics.  It is

 * defined in this strange way to make sure applications compiled against

 * new headers get at least O_DSYNC semantics on older kernels.

 *

 * This has the nice side-effect that we can simply test for O_DSYNC

 * wherever we do not care if O_DSYNC or O_SYNC is used.

 *

 * Note: __O_SYNC must never be used directly.

 */

#define __O_SYNC	020000000

#define O_SYNC		(__O_SYNC|O_DSYNC)



#define F_GETLK		7

#define F_SETLK		8

arch/blackfin/include/asm/fcntl.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef _BFIN_FCNTL_H

#define _BFIN_FCNTL_H



/* open/fcntl - O_SYNC is only implemented on blocks devices and on files

   located on an ext2 file system */

#define O_DIRECTORY	 040000	/* must be a directory */

#define O_NOFOLLOW	0100000	/* don't follow links */

#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */

arch/mips/include/asm/fcntl.h

+16 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 




#define O_APPEND	0x0008

#define O_SYNC		0x0010

#define O_DSYNC		0x0010	/* used to be O_SYNC, see below */

#define O_NONBLOCK	0x0080

#define O_CREAT         0x0100	/* not fcntl */

#define O_TRUNC		0x0200	/* not fcntl */
@@ -18,6 +18,21 @@ 
#define O_NOCTTY	0x0800	/* not fcntl */

#define FASYNC		0x1000	/* fcntl, for BSD compatibility */

#define O_LARGEFILE	0x2000	/* allow large file opens */

/*

 * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using

 * the O_SYNC flag.  We continue to use the existing numerical value

 * for O_DSYNC semantics now, but using the correct symbolic name for it.

 * This new value is used to request true Posix O_SYNC semantics.  It is

 * defined in this strange way to make sure applications compiled against

 * new headers get at least O_DSYNC semantics on older kernels.

 *

 * This has the nice side-effect that we can simply test for O_DSYNC

 * wherever we do not care if O_DSYNC or O_SYNC is used.

 *

 * Note: __O_SYNC must never be used directly.

 */

#define __O_SYNC	0x4000

#define O_SYNC		(__O_SYNC|O_DSYNC)

#define O_DIRECT	0x8000	/* direct disk access hint */



#define F_GETLK		14