Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  vfs: make unlink() and rmdir() return ENOENT in preference to EROFS
  lmLogOpen() broken failure exit
  usb: remove bad dput after dentry_unhash
  more conservative S_NOSEC handling

diff --combined fs/btrfs/super.c
index 117e74e3604b00a83eefeb512fc4816a9132bb08,d158b672a2d22c077b21b94a2489fc6cd6eb6429..0bb4ebbb71b7b0bf6861b7a5efde6f5cf2f5b97e
--- 1/fs/btrfs/super.c
--- 2/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -161,8 -161,7 +161,8 @@@ enum 
        Opt_compress_type, Opt_compress_force, Opt_compress_force_type,
        Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
        Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
 -      Opt_enospc_debug, Opt_subvolrootid, Opt_defrag, Opt_err,
 +      Opt_enospc_debug, Opt_subvolrootid, Opt_defrag,
 +      Opt_inode_cache, Opt_err,
  };
  
  static match_table_t tokens = {
@@@ -194,7 -193,6 +194,7 @@@
        {Opt_enospc_debug, "enospc_debug"},
        {Opt_subvolrootid, "subvolrootid=%d"},
        {Opt_defrag, "autodefrag"},
 +      {Opt_inode_cache, "inode_cache"},
        {Opt_err, NULL},
  };
  
@@@ -363,10 -361,6 +363,10 @@@ int btrfs_parse_options(struct btrfs_ro
                        printk(KERN_INFO "btrfs: enabling disk space caching\n");
                        btrfs_set_opt(info->mount_opt, SPACE_CACHE);
                        break;
 +              case Opt_inode_cache:
 +                      printk(KERN_INFO "btrfs: enabling inode map caching\n");
 +                      btrfs_set_opt(info->mount_opt, INODE_MAP_CACHE);
 +                      break;
                case Opt_clear_cache:
                        printk(KERN_INFO "btrfs: force clearing of disk cache\n");
                        btrfs_set_opt(info->mount_opt, CLEAR_CACHE);
@@@ -825,7 -819,7 +825,7 @@@ static struct dentry *btrfs_mount(struc
        } else {
                char b[BDEVNAME_SIZE];
  
-               s->s_flags = flags;
+               s->s_flags = flags | MS_NOSEC;
                strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
                error = btrfs_fill_super(s, fs_devices, data,
                                         flags & MS_SILENT ? 1 : 0);