瀏覽代碼

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6

* '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
Linus Torvalds 15 年之前
父節點
當前提交
45480aa75b
共有 2 個文件被更改,包括 0 次插入3 次删除
  1. 0 1
      fs/udf/file.c
  2. 0 2
      fs/udf/super.c

+ 0 - 1
fs/udf/file.c

@@ -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"

+ 0 - 2
fs/udf/super.c

@@ -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 */