Merge branch 'for-linus' into for-next

diff --combined fs/ufs/inode.c
index 99aaf5c,2d93ab0..f913a69
--- 1/fs/ufs/inode.c
--- 2/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@@ -572,10 -572,9 +572,10 @@@ static void ufs_set_inode_ops(struct in
                inode->i_fop = &ufs_dir_operations;
                inode->i_mapping->a_ops = &ufs_aops;
        } else if (S_ISLNK(inode->i_mode)) {
 -              if (!inode->i_blocks)
 +              if (!inode->i_blocks) {
                        inode->i_op = &ufs_fast_symlink_inode_operations;
 -              else {
 +                      inode->i_link = (char *)UFS_I(inode)->i_u1.i_symlink;
 +              } else {
                        inode->i_op = &ufs_symlink_inode_operations;
                        inode->i_mapping->a_ops = &ufs_aops;
                }
@@@ -903,6 -902,9 +903,9 @@@ void ufs_evict_inode(struct inode * ino
        invalidate_inode_buffers(inode);
        clear_inode(inode);
  
-       if (want_delete)
+       if (want_delete) {
+               lock_ufs(inode->i_sb);
                ufs_free_inode(inode);
+               unlock_ufs(inode->i_sb);
+       }
  }

diff --combined fs/ufs/namei.c
index f773deb,d3fdfa2..4796655
--- 1/fs/ufs/namei.c
--- 2/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@@ -56,11 -56,9 +56,9 @@@ static struct dentry *ufs_lookup(struc
        if (dentry->d_name.len > UFS_MAXNAMLEN)
                return ERR_PTR(-ENAMETOOLONG);
  
-       lock_ufs(dir->i_sb);
        ino = ufs_inode_by_name(dir, &dentry->d_name);
        if (ino)
                inode = ufs_iget(dir->i_sb, ino);
-       unlock_ufs(dir->i_sb);
        return d_splice_alias(inode, dentry);
  }
  
@@@ -76,24 -74,16 +74,16 @@@ static int ufs_create (struct inode * d
                bool excl)
  {
        struct inode *inode;
-       int err;
- 
-       UFSD("BEGIN\n");
  
        inode = ufs_new_inode(dir, mode);
-       err = PTR_ERR(inode);
+       if (IS_ERR(inode))
+               return PTR_ERR(inode);
  
-       if (!IS_ERR(inode)) {
-               inode->i_op = &ufs_file_inode_operations;
-               inode->i_fop = &ufs_file_operations;
-               inode->i_mapping->a_ops = &ufs_aops;
-               mark_inode_dirty(inode);
-               lock_ufs(dir->i_sb);
-               err = ufs_add_nondir(dentry, inode);
-               unlock_ufs(dir->i_sb);
-       }
-       UFSD("END: err=%d\n", err);
-       return err;
+       inode->i_op = &ufs_file_inode_operations;
+       inode->i_fop = &ufs_file_operations;
+       inode->i_mapping->a_ops = &ufs_aops;
+       mark_inode_dirty(inode);
+       return ufs_add_nondir(dentry, inode);
  }
  
  static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
@@@ -110,9 -100,7 +100,7 @@@
                init_special_inode(inode, mode, rdev);
                ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
                mark_inode_dirty(inode);
-               lock_ufs(dir->i_sb);
                err = ufs_add_nondir(dentry, inode);
-               unlock_ufs(dir->i_sb);
        }
        return err;
  }
@@@ -121,19 -109,18 +109,18 @@@ static int ufs_symlink (struct inode * 
        const char * symname)
  {
        struct super_block * sb = dir->i_sb;
-       int err = -ENAMETOOLONG;
+       int err;
        unsigned l = strlen(symname)+1;
        struct inode * inode;
  
        if (l > sb->s_blocksize)
-               goto out_notlocked;
+               return -ENAMETOOLONG;
  
        inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
        err = PTR_ERR(inode);
        if (IS_ERR(inode))
-               goto out_notlocked;
+               return err;
  
-       lock_ufs(dir->i_sb);
        if (l > UFS_SB(sb)->s_uspi->s_maxsymlinklen) {
                /* slow symlink */
                inode->i_op = &ufs_symlink_inode_operations;
@@@ -144,23 -131,18 +131,19 @@@
        } else {
                /* fast symlink */
                inode->i_op = &ufs_fast_symlink_inode_operations;
 -              memcpy(UFS_I(inode)->i_u1.i_symlink, symname, l);
 +              inode->i_link = (char *)UFS_I(inode)->i_u1.i_symlink;
 +              memcpy(inode->i_link, symname, l);
                inode->i_size = l-1;
        }
        mark_inode_dirty(inode);
  
-       err = ufs_add_nondir(dentry, inode);
- out:
-       unlock_ufs(dir->i_sb);
- out_notlocked:
-       return err;
+       return ufs_add_nondir(dentry, inode);
  
  out_fail:
        inode_dec_link_count(inode);
        unlock_new_inode(inode);
        iput(inode);
-       goto out;
+       return err;
  }
  
  static int ufs_link (struct dentry * old_dentry, struct inode * dir,
@@@ -169,14 -151,16 +152,16 @@@
        struct inode *inode = d_inode(old_dentry);
        int error;
  
-       lock_ufs(dir->i_sb);
- 
        inode->i_ctime = CURRENT_TIME_SEC;
        inode_inc_link_count(inode);
        ihold(inode);
  
-       error = ufs_add_nondir(dentry, inode);
-       unlock_ufs(dir->i_sb);
+       error = ufs_add_link(dentry, inode);
+       if (error) {
+               inode_dec_link_count(inode);
+               iput(inode);
+       } else
+               d_instantiate(dentry, inode);
        return error;
  }
  
@@@ -185,9 -169,12 +170,12 @@@ static int ufs_mkdir(struct inode * dir
        struct inode * inode;
        int err;
  
+       inode_inc_link_count(dir);
+ 
        inode = ufs_new_inode(dir, S_IFDIR|mode);
+       err = PTR_ERR(inode);
        if (IS_ERR(inode))
-               return PTR_ERR(inode);
+               goto out_dir;
  
        inode->i_op = &ufs_dir_inode_operations;
        inode->i_fop = &ufs_dir_operations;
@@@ -195,9 -182,6 +183,6 @@@
  
        inode_inc_link_count(inode);
  
-       lock_ufs(dir->i_sb);
-       inode_inc_link_count(dir);
- 
        err = ufs_make_empty(inode, dir);
        if (err)
                goto out_fail;
@@@ -205,20 -189,19 +190,19 @@@
        err = ufs_add_link(dentry, inode);
        if (err)
                goto out_fail;
-       unlock_ufs(dir->i_sb);
  
+       unlock_new_inode(inode);
        d_instantiate(dentry, inode);
- out:
-       return err;
+       return 0;
  
  out_fail:
        inode_dec_link_count(inode);
        inode_dec_link_count(inode);
        unlock_new_inode(inode);
        iput (inode);
+ out_dir:
        inode_dec_link_count(dir);
-       unlock_ufs(dir->i_sb);
-       goto out;
+       return err;
  }
  
  static int ufs_unlink(struct inode *dir, struct dentry *dentry)
@@@ -248,7 -231,6 +232,6 @@@ static int ufs_rmdir (struct inode * di
        struct inode * inode = d_inode(dentry);
        int err= -ENOTEMPTY;
  
-       lock_ufs(dir->i_sb);
        if (ufs_empty_dir (inode)) {
                err = ufs_unlink(dir, dentry);
                if (!err) {
@@@ -257,7 -239,6 +240,6 @@@
                        inode_dec_link_count(dir);
                }
        }
-       unlock_ufs(dir->i_sb);
        return err;
  }
  
@@@ -295,7 -276,7 +277,7 @@@ static int ufs_rename(struct inode *old
                new_de = ufs_find_entry(new_dir, &new_dentry->d_name, &new_page);
                if (!new_de)
                        goto out_dir;
-               ufs_set_link(new_dir, new_de, new_page, old_inode);
+               ufs_set_link(new_dir, new_de, new_page, old_inode, 1);
                new_inode->i_ctime = CURRENT_TIME_SEC;
                if (dir_de)
                        drop_nlink(new_inode);
@@@ -318,7 -299,12 +300,12 @@@
        mark_inode_dirty(old_inode);
  
        if (dir_de) {
-               ufs_set_link(old_inode, dir_de, dir_page, new_dir);
+               if (old_dir != new_dir)
+                       ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0);
+               else {
+                       kunmap(dir_page);
+                       page_cache_release(dir_page);
+               }
                inode_dec_link_count(old_dir);
        }
        return 0;