Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 19:56:27 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 19:56:27 +0000 (12:56 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: super.c Fix warning: variable 'sbi' set but not used
  udf: remove duplicated #include

fs/udf/file.c
fs/udf/super.c

index 94e06d6bddbd1fb973d7bd70b37664c485973529..6e450e01a1bb81da6987801565de3b3323afc165 100644 (file)
@@ -36,7 +36,6 @@
 #include <linux/pagemap.h>
 #include <linux/buffer_head.h>
 #include <linux/aio.h>
-#include <linux/smp_lock.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"
index 612d1e2e285a158bfd1bf7661621565dda955de9..12bb651e54009017cad7148fa878c359396c8a46 100644 (file)
@@ -1579,9 +1579,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 */