Patched in Tegra support.

11 files changed, 59 insertions, 46 deletions

diff --git a/fs/afs/callback.c b/fs/afs/callback.c
index 7ef637d7f3a..587ef5123cd 100644
--- a/fs/afs/callback.c
+++ b/fs/afs/callback.c
@@ -351,7 +351,9 @@ void afs_dispatch_give_up_callbacks(struct work_struct *work)
  */
 void afs_flush_callback_breaks(struct afs_server *server)
 {
-        mod_delayed_work(afs_callback_update_worker, &server->cb_break_work, 0);
+        cancel_delayed_work(&server->cb_break_work);
+        queue_delayed_work(afs_callback_update_worker,
+                           &server->cb_break_work, 0);
 }
 
 #if 0
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index db477906ba4..1b0b1955001 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -20,17 +20,17 @@
 #include "internal.h"
 
 static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
-                                 unsigned int flags);
+                                 struct nameidata *nd);
 static int afs_dir_open(struct inode *inode, struct file *file);
 static int afs_readdir(struct file *file, void *dirent, filldir_t filldir);
-static int afs_d_revalidate(struct dentry *dentry, unsigned int flags);
+static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd);
 static int afs_d_delete(const struct dentry *dentry);
 static void afs_d_release(struct dentry *dentry);
 static int afs_lookup_filldir(void *_cookie, const char *name, int nlen,
                                   loff_t fpos, u64 ino, unsigned dtype);
-static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-                      bool excl);
-static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
+static int afs_create(struct inode *dir, struct dentry *dentry, int mode,
+                      struct nameidata *nd);
+static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
 static int afs_rmdir(struct inode *dir, struct dentry *dentry);
 static int afs_unlink(struct inode *dir, struct dentry *dentry);
 static int afs_link(struct dentry *from, struct inode *dir,
@@ -516,7 +516,7 @@ out:
  * look up an entry in a directory
  */
 static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
-                                 unsigned int flags)
+                                 struct nameidata *nd)
 {
         struct afs_vnode *vnode;
         struct afs_fid fid;
@@ -598,7 +598,7 @@ success:
  * - NOTE! the hit can be a negative hit too, so we can't assume we have an
  *   inode
  */
-static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
+static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
         struct afs_vnode *vnode, *dir;
         struct afs_fid uninitialized_var(fid);
@@ -607,7 +607,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
         void *dir_version;
         int ret;
 
-        if (flags & LOOKUP_RCU)
+        if (nd->flags & LOOKUP_RCU)
                 return -ECHILD;
 
         vnode = AFS_FS_I(dentry->d_inode);
@@ -764,7 +764,7 @@ static void afs_d_release(struct dentry *dentry)
 /*
  * create a directory on an AFS filesystem
  */
-static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
         struct afs_file_status status;
         struct afs_callback cb;
@@ -777,7 +777,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 
         dvnode = AFS_FS_I(dir);
 
-        _enter("{%x:%u},{%s},%ho",
+        _enter("{%x:%u},{%s},%o",
                dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode);
 
         ret = -ENAMETOOLONG;
@@ -948,8 +948,8 @@ error:
 /*
  * create a regular file on an AFS filesystem
  */
-static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-                      bool excl)
+static int afs_create(struct inode *dir, struct dentry *dentry, int mode,
+                      struct nameidata *nd)
 {
         struct afs_file_status status;
         struct afs_callback cb;
@@ -962,7 +962,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
         dvnode = AFS_FS_I(dir);
 
-        _enter("{%x:%u},{%s},%ho,",
+        _enter("{%x:%u},{%s},%o,",
                dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode);
 
         ret = -ENAMETOOLONG;
diff --git a/fs/afs/file.c b/fs/afs/file.c
index 8f6e9234d56..14d89fa58fe 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -251,7 +251,7 @@ static int afs_readpages(struct file *file, struct address_space *mapping,
         ASSERT(key != NULL);
 
         vnode = AFS_FS_I(mapping->host);
-        if (test_bit(AFS_VNODE_DELETED, &vnode->flags)) {
+        if (vnode->flags & AFS_VNODE_DELETED) {
                 _leave(" = -ESTALE");
                 return -ESTALE;
         }
diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index b960ff05ea0..346e3289abd 100644
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -90,7 +90,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp,
                         vnode->vfs_inode.i_uid = status->owner;
                         vnode->vfs_inode.i_gid = status->group;
                         vnode->vfs_inode.i_generation = vnode->fid.unique;
-                        set_nlink(&vnode->vfs_inode, status->nlink);
+                        vnode->vfs_inode.i_nlink = status->nlink;
 
                         mode = vnode->vfs_inode.i_mode;
                         mode &= ~S_IALLUGO;
@@ -365,10 +365,10 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call,
                 _debug("extract data");
                 if (call->count > 0) {
                         page = call->reply3;
-                        buffer = kmap_atomic(page);
+                        buffer = kmap_atomic(page, KM_USER0);
                         ret = afs_extract_data(call, skb, last, buffer,
                                                call->count);
-                        kunmap_atomic(buffer);
+                        kunmap_atomic(buffer, KM_USER0);
                         switch (ret) {
                         case 0:         break;
                         case -EAGAIN:   return 0;
@@ -411,9 +411,9 @@ static int afs_deliver_fs_fetch_data(struct afs_call *call,
         if (call->count < PAGE_SIZE) {
                 _debug("clear");
                 page = call->reply3;
-                buffer = kmap_atomic(page);
+                buffer = kmap_atomic(page, KM_USER0);
                 memset(buffer + call->count, 0, PAGE_SIZE - call->count);
-                kunmap_atomic(buffer);
+                kunmap_atomic(buffer, KM_USER0);
         }
 
         _leave(" = 0 [done]");
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 95cffd38239..0fdab6e03d8 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -67,7 +67,7 @@ static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key)
                 fscache_attr_changed(vnode->cache);
 #endif
 
-        set_nlink(inode, vnode->status.nlink);
+        inode->i_nlink          = vnode->status.nlink;
         inode->i_uid            = vnode->status.owner;
         inode->i_gid            = 0;
         inode->i_size           = vnode->status.size;
@@ -174,7 +174,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
         inode->i_size           = 0;
         inode->i_mode           = S_IFDIR | S_IRUGO | S_IXUGO;
         inode->i_op             = &afs_autocell_inode_operations;
-        set_nlink(inode, 2);
+        inode->i_nlink          = 2;
         inode->i_uid            = 0;
         inode->i_gid            = 0;
         inode->i_ctime.tv_sec   = get_seconds();
@@ -423,7 +423,7 @@ void afs_evict_inode(struct inode *inode)
         ASSERTCMP(inode->i_ino, ==, vnode->fid.vnode);
 
         truncate_inode_pages(&inode->i_data, 0);
-        clear_inode(inode);
+        end_writeback(inode);
 
         afs_give_up_callback(vnode);
 
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index a306bb6d88d..d2b0888126d 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -109,7 +109,7 @@ struct afs_call {
         unsigned                reply_size;     /* current size of reply */
         unsigned                first_offset;   /* offset into mapping[first] */
         unsigned                last_to;        /* amount of mapping[last] */
-        unsigned                offset;         /* offset into received data store */
+        unsigned short          offset;         /* offset into received data store */
         unsigned char           unmarshall;     /* unmarshalling phase */
         bool                    incoming;       /* T if incoming call */
         bool                    send_pages;     /* T if data from mapping should be sent */
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 9682c33d5da..aa59184151d 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -22,7 +22,7 @@
 
 static struct dentry *afs_mntpt_lookup(struct inode *dir,
                                        struct dentry *dentry,
-                                       unsigned int flags);
+                                       struct nameidata *nd);
 static int afs_mntpt_open(struct inode *inode, struct file *file);
 static void afs_mntpt_expiry_timed_out(struct work_struct *work);
 
@@ -104,7 +104,7 @@ out:
  */
 static struct dentry *afs_mntpt_lookup(struct inode *dir,
                                        struct dentry *dentry,
-                                       unsigned int flags)
+                                       struct nameidata *nd)
 {
         _enter("%p,%p{%p{%s},%s}",
                dir,
@@ -200,9 +200,9 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
                 if (PageError(page))
                         goto error;
 
-                buf = kmap_atomic(page);
+                buf = kmap_atomic(page, KM_USER0);
                 memcpy(devname, buf, size);
-                kunmap_atomic(buf);
+                kunmap_atomic(buf, KM_USER0);
                 page_cache_release(page);
                 page = NULL;
         }
@@ -242,7 +242,7 @@ struct vfsmount *afs_d_automount(struct path *path)
 {
         struct vfsmount *newmnt;
 
-        _enter("{%s}", path->dentry->d_name.name);
+        _enter("{%s,%s}", path->mnt->mnt_devname, path->dentry->d_name.name);
 
         newmnt = afs_mntpt_do_automount(path->dentry);
         if (IS_ERR(newmnt))
@@ -252,7 +252,7 @@ struct vfsmount *afs_d_automount(struct path *path)
         mnt_set_expiry(newmnt, &afs_vfsmounts);
         queue_delayed_work(afs_wq, &afs_mntpt_expiry_timer,
                            afs_mntpt_expiry_timeout * HZ);
-        _leave(" = %p", newmnt);
+        _leave(" = %p {%s}", newmnt, newmnt->mnt_devname);
         return newmnt;
 }
 
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index 8ad8c2a0703..e45a323aebb 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -314,7 +314,6 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,
         struct msghdr msg;
         struct kvec iov[1];
         int ret;
-        struct sk_buff *skb;
 
         _enter("%x,{%d},", addr->s_addr, ntohs(call->port));
 
@@ -381,8 +380,6 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,
 
 error_do_abort:
         rxrpc_kernel_abort_call(rxcall, RX_USER_ABORT);
-        while ((skb = skb_dequeue(&call->rx_queue)))
-                afs_free_skb(skb);
         rxrpc_kernel_end_call(rxcall);
         call->rxcall = NULL;
 error_kill_call:
diff --git a/fs/afs/server.c b/fs/afs/server.c
index f342acf3547..d59b7516e94 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -285,7 +285,12 @@ static void afs_reap_server(struct work_struct *work)
                 expiry = server->time_of_death + afs_server_timeout;
                 if (expiry > now) {
                         delay = (expiry - now) * HZ;
-                        mod_delayed_work(afs_wq, &afs_server_reaper, delay);
+                        if (!queue_delayed_work(afs_wq, &afs_server_reaper,
+                                                delay)) {
+                                cancel_delayed_work(&afs_server_reaper);
+                                queue_delayed_work(afs_wq, &afs_server_reaper,
+                                                   delay);
+                        }
                         break;
                 }
 
@@ -318,5 +323,6 @@ static void afs_reap_server(struct work_struct *work)
 void __exit afs_purge_servers(void)
 {
         afs_server_timeout = 0;
-        mod_delayed_work(afs_wq, &afs_server_reaper, 0);
+        cancel_delayed_work(&afs_server_reaper);
+        queue_delayed_work(afs_wq, &afs_server_reaper, 0);
 }
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 43165009428..356dcf0929e 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -123,11 +123,6 @@ void __exit afs_fs_exit(void)
                 BUG();
         }
 
-        /*
-         * Make sure all delayed rcu free inodes are flushed before we
-         * destroy cache.
-         */
-        rcu_barrier();
         kmem_cache_destroy(afs_inode_cachep);
         _leave("");
 }
@@ -306,6 +301,7 @@ static int afs_fill_super(struct super_block *sb,
 {
         struct afs_super_info *as = sb->s_fs_info;
         struct afs_fid fid;
+        struct dentry *root = NULL;
         struct inode *inode = NULL;
         int ret;
 
@@ -331,16 +327,18 @@ static int afs_fill_super(struct super_block *sb,
                 set_bit(AFS_VNODE_AUTOCELL, &AFS_FS_I(inode)->flags);
 
         ret = -ENOMEM;
-        sb->s_root = d_make_root(inode);
-        if (!sb->s_root)
+        root = d_alloc_root(inode);
+        if (!root)
                 goto error;
 
         sb->s_d_op = &afs_fs_dentry_operations;
+        sb->s_root = root;
 
         _leave(" = 0");
         return 0;
 
 error:
+        iput(inode);
         _leave(" = %d", ret);
         return ret;
 }
@@ -400,7 +398,7 @@ static struct dentry *afs_mount(struct file_system_type *fs_type,
         as->volume = vol;
 
         /* allocate a deviceless superblock */
-        sb = sget(fs_type, afs_test_super, afs_set_super, flags, as);
+        sb = sget(fs_type, afs_test_super, afs_set_super, as);
         if (IS_ERR(sb)) {
                 ret = PTR_ERR(sb);
                 afs_put_volume(vol);
@@ -411,6 +409,7 @@ static struct dentry *afs_mount(struct file_system_type *fs_type,
         if (!sb->s_root) {
                 /* initial superblock/root creation */
                 _debug("create");
+                sb->s_flags = flags;
                 ret = afs_fill_super(sb, &params);
                 if (ret < 0) {
                         deactivate_locked_super(sb);
@@ -496,6 +495,7 @@ static void afs_i_callback(struct rcu_head *head)
 {
         struct inode *inode = container_of(head, struct inode, i_rcu);
         struct afs_vnode *vnode = AFS_FS_I(inode);
+        INIT_LIST_HEAD(&inode->i_dentry);
         kmem_cache_free(afs_inode_cachep, vnode);
 }
 
diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c
index 57bcb159653..431984d2e37 100644
--- a/fs/afs/vlocation.c
+++ b/fs/afs/vlocation.c
@@ -561,7 +561,12 @@ static void afs_vlocation_reaper(struct work_struct *work)
                 if (expiry > now) {
                         delay = (expiry - now) * HZ;
                         _debug("delay %lu", delay);
-                        mod_delayed_work(afs_wq, &afs_vlocation_reap, delay);
+                        if (!queue_delayed_work(afs_wq, &afs_vlocation_reap,
+                                                delay)) {
+                                cancel_delayed_work(&afs_vlocation_reap);
+                                queue_delayed_work(afs_wq, &afs_vlocation_reap,
+                                                   delay);
+                        }
                         break;
                 }
 
@@ -609,10 +614,13 @@ void afs_vlocation_purge(void)
         spin_lock(&afs_vlocation_updates_lock);
         list_del_init(&afs_vlocation_updates);
         spin_unlock(&afs_vlocation_updates_lock);
-        mod_delayed_work(afs_vlocation_update_worker, &afs_vlocation_update, 0);
+        cancel_delayed_work(&afs_vlocation_update);
+        queue_delayed_work(afs_vlocation_update_worker,
+                           &afs_vlocation_update, 0);
         destroy_workqueue(afs_vlocation_update_worker);
 
-        mod_delayed_work(afs_wq, &afs_vlocation_reap, 0);
+        cancel_delayed_work(&afs_vlocation_reap);
+        queue_delayed_work(afs_wq, &afs_vlocation_reap, 0);
 }
 
 /*