Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[karo-tx-linux.git] / fs / udf / super.c

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 612d1e2e285a158bfd1bf7661621565dda955de9..65412d84a45d7c5e6e8563111c7ca4b66cec32b7 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -175,8 +175,7 @@ static const struct super_operations udf_sb_ops = {
        .alloc_inode    = udf_alloc_inode,
        .destroy_inode  = udf_destroy_inode,
        .write_inode    = udf_write_inode,
-       .delete_inode   = udf_delete_inode,
-       .clear_inode    = udf_clear_inode,
+       .evict_inode    = udf_evict_inode,
        .put_super      = udf_put_super,
        .sync_fs        = udf_sync_fs,
        .statfs         = udf_statfs,
@@ -1579,9 +1578,7 @@ static int udf_load_sequence(struct super_block *sb, struct buffer_head *bh,
 {
        struct anchorVolDescPtr *anchor;
        long main_s, main_e, reserve_s, reserve_e;
-       struct udf_sb_info *sbi;
 
-       sbi = UDF_SB(sb);
        anchor = (struct anchorVolDescPtr *)bh->b_data;
 
        /* Locate the main sequence */