Merge branch 'fast_track' into for_next
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 8c892e9..504fb3f 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -975,7 +975,7 @@
* Initialize args struct so we know whether arg was
* found; some options take optional arguments.
*/
- args[0].to = args[0].from = 0;
+ args[0].to = args[0].from = NULL;
token = match_token(p, tokens, args);
switch (token) {
case Opt_bsd_df:
@@ -1479,10 +1479,12 @@
}
if (EXT3_SB(sb)->s_mount_state & EXT3_ERROR_FS) {
- if (es->s_last_orphan)
+ /* don't clear list on RO mount w/ errors */
+ if (es->s_last_orphan && !(s_flags & MS_RDONLY)) {
jbd_debug(1, "Errors on filesystem, "
"clearing orphan list.\n");
- es->s_last_orphan = 0;
+ es->s_last_orphan = 0;
+ }
jbd_debug(1, "Skipping orphan recovery on fs with errors.\n");
return;
}
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index d319963..c196369 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -896,7 +896,7 @@
#endif
/* Actual operations that are exported to VFS-land */
-const struct xattr_handler *reiserfs_xattr_handlers[] = {
+static const struct xattr_handler *reiserfs_xattr_handlers[] = {
#ifdef CONFIG_REISERFS_FS_XATTR
&reiserfs_xattr_user_handler,
&reiserfs_xattr_trusted_handler,
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index aa23346..1a0588e 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -100,6 +100,12 @@
return block_write_full_page(page, udf_get_block, wbc);
}
+static int udf_writepages(struct address_space *mapping,
+ struct writeback_control *wbc)
+{
+ return mpage_writepages(mapping, wbc, udf_get_block);
+}
+
static int udf_readpage(struct file *file, struct page *page)
{
return mpage_readpage(page, udf_get_block);
@@ -145,6 +151,7 @@
.readpage = udf_readpage,
.readpages = udf_readpages,
.writepage = udf_writepage,
+ .writepages = udf_writepages,
.write_begin = udf_write_begin,
.write_end = generic_write_end,
.bmap = udf_bmap,