Patched in Tegra support.

1 files changed, 34 insertions, 41 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index ad7774d3209..9659b7c0046 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -10,8 +10,6 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
@@ -24,16 +22,16 @@
 
 static int jffs2_readdir (struct file *, void *, filldir_t);
 
-static int jffs2_create (struct inode *,struct dentry *,umode_t,
-                         bool);
+static int jffs2_create (struct inode *,struct dentry *,int,
+                         struct nameidata *);
 static struct dentry *jffs2_lookup (struct inode *,struct dentry *,
-                                    unsigned int);
+                                    struct nameidata *);
 static int jffs2_link (struct dentry *,struct inode *,struct dentry *);
 static int jffs2_unlink (struct inode *,struct dentry *);
 static int jffs2_symlink (struct inode *,struct dentry *,const char *);
-static int jffs2_mkdir (struct inode *,struct dentry *,umode_t);
+static int jffs2_mkdir (struct inode *,struct dentry *,int);
 static int jffs2_rmdir (struct inode *,struct dentry *);
-static int jffs2_mknod (struct inode *,struct dentry *,umode_t,dev_t);
+static int jffs2_mknod (struct inode *,struct dentry *,int,dev_t);
 static int jffs2_rename (struct inode *, struct dentry *,
                          struct inode *, struct dentry *);
 
@@ -74,14 +72,14 @@ const struct inode_operations jffs2_dir_inode_operations =
    nice and simple
 */
 static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
-                                   unsigned int flags)
+                                   struct nameidata *nd)
 {
         struct jffs2_inode_info *dir_f;
         struct jffs2_full_dirent *fd = NULL, *fd_list;
         uint32_t ino = 0;
         struct inode *inode = NULL;
 
-        jffs2_dbg(1, "jffs2_lookup()\n");
+        D1(printk(KERN_DEBUG "jffs2_lookup()\n"));
 
         if (target->d_name.len > JFFS2_MAX_NAME_LEN)
                 return ERR_PTR(-ENAMETOOLONG);
@@ -105,7 +103,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
         if (ino) {
                 inode = jffs2_iget(dir_i->i_sb, ino);
                 if (IS_ERR(inode))
-                        pr_warn("iget() failed for ino #%u\n", ino);
+                        printk(KERN_WARNING "iget() failed for ino #%u\n", ino);
         }
 
         return d_splice_alias(inode, target);
@@ -121,22 +119,21 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
         struct jffs2_full_dirent *fd;
         unsigned long offset, curofs;
 
-        jffs2_dbg(1, "jffs2_readdir() for dir_i #%lu\n",
-                  filp->f_path.dentry->d_inode->i_ino);
+        D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino));
 
         f = JFFS2_INODE_INFO(inode);
 
         offset = filp->f_pos;
 
         if (offset == 0) {
-                jffs2_dbg(1, "Dirent 0: \".\", ino #%lu\n", inode->i_ino);
+                D1(printk(KERN_DEBUG "Dirent 0: \".\", ino #%lu\n", inode->i_ino));
                 if (filldir(dirent, ".", 1, 0, inode->i_ino, DT_DIR) < 0)
                         goto out;
                 offset++;
         }
         if (offset == 1) {
                 unsigned long pino = parent_ino(filp->f_path.dentry);
-                jffs2_dbg(1, "Dirent 1: \"..\", ino #%lu\n", pino);
+                D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino));
                 if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)
                         goto out;
                 offset++;
@@ -149,18 +146,16 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 curofs++;
                 /* First loop: curofs = 2; offset = 2 */
                 if (curofs < offset) {
-                        jffs2_dbg(2, "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",
-                                  fd->name, fd->ino, fd->type, curofs, offset);
+                        D2(printk(KERN_DEBUG "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",
+                                  fd->name, fd->ino, fd->type, curofs, offset));
                         continue;
                 }
                 if (!fd->ino) {
-                        jffs2_dbg(2, "Skipping deletion dirent \"%s\"\n",
-                                  fd->name);
+                        D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name));
                         offset++;
                         continue;
                 }
-                jffs2_dbg(2, "Dirent %ld: \"%s\", ino #%u, type %d\n",
-                          offset, fd->name, fd->ino, fd->type);
+                D2(printk(KERN_DEBUG "Dirent %ld: \"%s\", ino #%u, type %d\n", offset, fd->name, fd->ino, fd->type));
                 if (filldir(dirent, fd->name, strlen(fd->name), offset, fd->ino, fd->type) < 0)
                         break;
                 offset++;
@@ -174,8 +169,8 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
 /***********************************************************************/
 
 
-static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
-                        umode_t mode, bool excl)
+static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode,
+                        struct nameidata *nd)
 {
         struct jffs2_raw_inode *ri;
         struct jffs2_inode_info *f, *dir_f;
@@ -189,12 +184,12 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
 
         c = JFFS2_SB_INFO(dir_i->i_sb);
 
-        jffs2_dbg(1, "%s()\n", __func__);
+        D1(printk(KERN_DEBUG "jffs2_create()\n"));
 
         inode = jffs2_new_inode(dir_i, mode, ri);
 
         if (IS_ERR(inode)) {
-                jffs2_dbg(1, "jffs2_new_inode() failed\n");
+                D1(printk(KERN_DEBUG "jffs2_new_inode() failed\n"));
                 jffs2_free_raw_inode(ri);
                 return PTR_ERR(inode);
         }
@@ -222,12 +217,12 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
 
         jffs2_free_raw_inode(ri);
 
-        jffs2_dbg(1, "%s(): Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",
-                  __func__, inode->i_ino, inode->i_mode, inode->i_nlink,
-                  f->inocache->pino_nlink, inode->i_mapping->nrpages);
+        D1(printk(KERN_DEBUG "jffs2_create: Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",
+                  inode->i_ino, inode->i_mode, inode->i_nlink,
+                  f->inocache->pino_nlink, inode->i_mapping->nrpages));
 
-        unlock_new_inode(inode);
         d_instantiate(dentry, inode);
+        unlock_new_inode(inode);
         return 0;
 
  fail:
@@ -250,7 +245,7 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
         ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
                               dentry->d_name.len, dead_f, now);
         if (dead_f->inocache)
-                set_nlink(dentry->d_inode, dead_f->inocache->pino_nlink);
+                dentry->d_inode->i_nlink = dead_f->inocache->pino_nlink;
         if (!ret)
                 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
         return ret;
@@ -283,7 +278,7 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
 
         if (!ret) {
                 mutex_lock(&f->sem);
-                set_nlink(old_dentry->d_inode, ++f->inocache->pino_nlink);
+                old_dentry->d_inode->i_nlink = ++f->inocache->pino_nlink;
                 mutex_unlock(&f->sem);
                 d_instantiate(dentry, old_dentry->d_inode);
                 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
@@ -367,15 +362,14 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
         /* We use f->target field to store the target path. */
         f->target = kmemdup(target, targetlen + 1, GFP_KERNEL);
         if (!f->target) {
-                pr_warn("Can't allocate %d bytes of memory\n", targetlen + 1);
+                printk(KERN_WARNING "Can't allocate %d bytes of memory\n", targetlen + 1);
                 mutex_unlock(&f->sem);
                 jffs2_complete_reservation(c);
                 ret = -ENOMEM;
                 goto fail;
         }
 
-        jffs2_dbg(1, "%s(): symlink's target '%s' cached\n",
-                  __func__, (char *)f->target);
+        D1(printk(KERN_DEBUG "jffs2_symlink: symlink's target '%s' cached\n", (char *)f->target));
 
         /* No data here. Only a metadata node, which will be
            obsoleted by the first data write
@@ -446,8 +440,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
         mutex_unlock(&dir_f->sem);
         jffs2_complete_reservation(c);
 
-        unlock_new_inode(inode);
         d_instantiate(dentry, inode);
+        unlock_new_inode(inode);
         return 0;
 
  fail:
@@ -456,7 +450,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
 }
 
 
-static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, umode_t mode)
+static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)
 {
         struct jffs2_inode_info *f, *dir_f;
         struct jffs2_sb_info *c;
@@ -503,7 +497,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, umode_t mode
         f = JFFS2_INODE_INFO(inode);
 
         /* Directories get nlink 2 at start */
-        set_nlink(inode, 2);
+        inode->i_nlink = 2;
         /* but ic->pino_nlink is the parent ino# */
         f->inocache->pino_nlink = dir_i->i_ino;
 
@@ -591,8 +585,8 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, umode_t mode
         mutex_unlock(&dir_f->sem);
         jffs2_complete_reservation(c);
 
-        unlock_new_inode(inode);
         d_instantiate(dentry, inode);
+        unlock_new_inode(inode);
         return 0;
 
  fail:
@@ -624,7 +618,7 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
         return ret;
 }
 
-static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode, dev_t rdev)
+static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, dev_t rdev)
 {
         struct jffs2_inode_info *f, *dir_f;
         struct jffs2_sb_info *c;
@@ -766,8 +760,8 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode
         mutex_unlock(&dir_f->sem);
         jffs2_complete_reservation(c);
 
-        unlock_new_inode(inode);
         d_instantiate(dentry, inode);
+        unlock_new_inode(inode);
         return 0;
 
  fail:
@@ -862,8 +856,7 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
                         f->inocache->pino_nlink++;
                 mutex_unlock(&f->sem);
 
-                pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n",
-                          __func__, ret);
+                printk(KERN_NOTICE "jffs2_rename(): Link succeeded, unlink failed (err %d). You now have a hard link\n", ret);
                 /* Might as well let the VFS know */
                 d_instantiate(new_dentry, old_dentry->d_inode);
                 ihold(old_dentry->d_inode);