Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

5 files changed, 4 insertions, 7 deletions

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 67d6634101..2e8c42639e 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/buffer_head.h>
 #include "volume.h"
 #include "vnode.h"
 #include <rxrpc/call.h>
@@ -37,7 +36,6 @@ struct inode_operations afs_file_inode_operations = {
 
 const struct address_space_operations afs_fs_aops = {
         .readpage       = afs_file_readpage,
-        .sync_page      = block_sync_page,
         .set_page_dirty = __set_page_dirty_nobuffers,
         .releasepage    = afs_file_releasepage,
         .invalidatepage = afs_file_invalidatepage,
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 4ebb30a50e..6f37754906 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -72,7 +72,6 @@ static int afs_inode_map_status(struct afs_vnode *vnode)
         inode->i_ctime.tv_sec   = vnode->status.mtime_server;
         inode->i_ctime.tv_nsec  = 0;
         inode->i_atime          = inode->i_mtime = inode->i_ctime;
-        inode->i_blksize        = PAGE_CACHE_SIZE;
         inode->i_blocks         = 0;
         inode->i_version        = vnode->fid.unique;
         inode->i_mapping->a_ops = &afs_fs_aops;
diff --git a/fs/afs/proc.c b/fs/afs/proc.c
index 101d21b6c0..86463ec9cc 100644
--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@ -775,6 +775,7 @@ static int afs_proc_cell_servers_release(struct inode *inode,
  * first item
  */
 static void *afs_proc_cell_servers_start(struct seq_file *m, loff_t *_pos)
+        __acquires(m->private->sv_lock)
 {
         struct list_head *_p;
         struct afs_cell *cell = m->private;
@@ -823,6 +824,7 @@ static void *afs_proc_cell_servers_next(struct seq_file *p, void *v,
  * clean up after reading from the cells list
  */
 static void afs_proc_cell_servers_stop(struct seq_file *p, void *v)
+        __releases(p->private->sv_lock)
 {
         struct afs_cell *cell = p->private;
 
diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c
index 331f730a1f..782ee7c600 100644
--- a/fs/afs/vlocation.c
+++ b/fs/afs/vlocation.c
@@ -281,11 +281,10 @@ int afs_vlocation_lookup(struct afs_cell *cell,
         spin_unlock(&cell->vl_gylock);
 
         /* not in the cell's in-memory lists - create a new record */
-        vlocation = kmalloc(sizeof(struct afs_vlocation), GFP_KERNEL);
+        vlocation = kzalloc(sizeof(struct afs_vlocation), GFP_KERNEL);
         if (!vlocation)
                 return -ENOMEM;
 
-        memset(vlocation, 0, sizeof(struct afs_vlocation));
         atomic_set(&vlocation->usage, 1);
         INIT_LIST_HEAD(&vlocation->link);
         rwlock_init(&vlocation->lock);
diff --git a/fs/afs/volume.c b/fs/afs/volume.c
index 0ff4b86476..768c6dbd32 100644
--- a/fs/afs/volume.c
+++ b/fs/afs/volume.c
@@ -186,11 +186,10 @@ int afs_volume_lookup(const char *name, struct afs_cell *cell, int rwpath,
         _debug("creating new volume record");
 
         ret = -ENOMEM;
-        volume = kmalloc(sizeof(struct afs_volume), GFP_KERNEL);
+        volume = kzalloc(sizeof(struct afs_volume), GFP_KERNEL);
         if (!volume)
                 goto error_up;
 
-        memset(volume, 0, sizeof(struct afs_volume));
         atomic_set(&volume->usage, 1);
         volume->type            = type;
         volume->type_force      = force;