Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45480aa7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1fc7995d 581b7e9f

fs/udf/file.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/buffer_head.h>

#include <linux/buffer_head.h>

#include <linux/aio.h>

#include <linux/aio.h>

#include <linux/smp_lock.h>





#include "udf_i.h"

#include "udf_i.h"

#include "udf_sb.h"

#include "udf_sb.h"

fs/udf/super.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1579,9 +1579,7 @@ static int udf_load_sequence(struct super_block *sb, struct buffer_head *bh, 
{

{

	struct anchorVolDescPtr *anchor;

	struct anchorVolDescPtr *anchor;

	long main_s, main_e, reserve_s, reserve_e;

	long main_s, main_e, reserve_s, reserve_e;

	struct udf_sb_info *sbi;





	sbi = UDF_SB(sb);

	anchor = (struct anchorVolDescPtr *)bh->b_data;

	anchor = (struct anchorVolDescPtr *)bh->b_data;





	/* Locate the main sequence */

	/* Locate the main sequence */