diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 12:14:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 12:14:01 -0400 |
| commit | e1cc485262846dcad931bf85ee655cbbb815bfe6 (patch) | |
| tree | 5b3ae42ce41f9fe0149ad49e9811ac8f8e8b2016 /fs/reiserfs | |
| parent | 4d6d367232813af09d9a1d90e3259e3ac42ee8a8 (diff) | |
| parent | 09e05d4805e6c524c1af74e524e5d0528bb3fef3 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext3 & udf fixes from Jan Kara:
"Shortlog pretty much says it all.
The interesting bits are UDF support for direct IO and ext3 fix for a
long standing oops in data=journal mode."
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
jbd: Fix assertion failure in commit code due to lacking transaction credits
UDF: Add support for O_DIRECT
ext3: Replace 0 with NULL for pointer in super.c file
udf: add writepages support for udf
ext3: don't clear orphan list on ro mount with errors
reiserfs: Make reiserfs_xattr_handlers static
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index d319963aeb11..c196369fe408 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -896,7 +896,7 @@ static int create_privroot(struct dentry *dentry) { return 0; } | |||
| 896 | #endif | 896 | #endif |
| 897 | 897 | ||
| 898 | /* Actual operations that are exported to VFS-land */ | 898 | /* Actual operations that are exported to VFS-land */ |
| 899 | const struct xattr_handler *reiserfs_xattr_handlers[] = { | 899 | static const struct xattr_handler *reiserfs_xattr_handlers[] = { |
| 900 | #ifdef CONFIG_REISERFS_FS_XATTR | 900 | #ifdef CONFIG_REISERFS_FS_XATTR |
| 901 | &reiserfs_xattr_user_handler, | 901 | &reiserfs_xattr_user_handler, |
| 902 | &reiserfs_xattr_trusted_handler, | 902 | &reiserfs_xattr_trusted_handler, |