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

Commit feb72ce8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  get rid of BKL in fs/sysv
  get rid of BKL in fs/minix
  get rid of BKL in fs/efs
  befs ->pust_super() doesn't need BKL
  Cleanup of adfs headers
  9P doesn't need BKL in ->umount_begin()
  fuse doesn't need BKL in ->umount_begin()
  No instance of ->bmap() needs BKL
  remove unlock_kernel() left accidentally
  ext4: avoid unnecessary spinlock in critical POSIX ACL path
  ext3: avoid unnecessary spinlock in critical POSIX ACL path
parents 65795efb 5ac3455a

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ readpages: no 
write_begin:		no	locks the page		yes

write_end:		no	yes, unlocks		yes

perform_write:		no	n/a			yes

bmap:			yes

bmap:			no

invalidatepage:		no	yes

releasepage:		no	yes

direct_IO:		no

fs/9p/vfs_super.c

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/mount.h>

#include <linux/idr.h>

#include <linux/sched.h>

#include <linux/smp_lock.h>

#include <net/9p/9p.h>

#include <net/9p/client.h>
@@ -231,10 +230,8 @@ v9fs_umount_begin(struct super_block *sb) 
{

	struct v9fs_session_info *v9ses;



	lock_kernel();

	v9ses = sb->s_fs_info;

	v9fs_session_cancel(v9ses);

	unlock_kernel();

}



static const struct super_operations v9fs_super_ops = {

fs/adfs/adfs.h

+55 −0
Original line number Diff line number Diff line 
#include <linux/fs.h>

#include <linux/adfs_fs.h>



/* Internal data structures for ADFS */



#define ADFS_FREE_FRAG		 0
@@ -16,6 +19,58 @@ 


struct buffer_head;



/*

 * adfs file system inode data in memory

 */

struct adfs_inode_info {

	loff_t		mmu_private;

	unsigned long	parent_id;	/* object id of parent		*/

	__u32		loadaddr;	/* RISC OS load address		*/

	__u32		execaddr;	/* RISC OS exec address		*/

	unsigned int	filetype;	/* RISC OS file type		*/

	unsigned int	attr;		/* RISC OS permissions		*/

	unsigned int	stamped:1;	/* RISC OS file has date/time	*/

	struct inode vfs_inode;

};



/*

 * Forward-declare this

 */

struct adfs_discmap;

struct adfs_dir_ops;



/*

 * ADFS file system superblock data in memory

 */

struct adfs_sb_info {

	struct adfs_discmap *s_map;	/* bh list containing map		 */

	struct adfs_dir_ops *s_dir;	/* directory operations			 */



	uid_t		s_uid;		/* owner uid				 */

	gid_t		s_gid;		/* owner gid				 */

	umode_t		s_owner_mask;	/* ADFS owner perm -> unix perm		 */

	umode_t		s_other_mask;	/* ADFS other perm -> unix perm		 */



	__u32		s_ids_per_zone;	/* max. no ids in one zone		 */

	__u32		s_idlen;	/* length of ID in map			 */

	__u32		s_map_size;	/* sector size of a map			 */

	unsigned long	s_size;		/* total size (in blocks) of this fs	 */

	signed int	s_map2blk;	/* shift left by this for map->sector	 */

	unsigned int	s_log2sharesize;/* log2 share size			 */

	__le32		s_version;	/* disc format version			 */

	unsigned int	s_namelen;	/* maximum number of characters in name	 */

};



static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb)

{

	return sb->s_fs_info;

}



static inline struct adfs_inode_info *ADFS_I(struct inode *inode)

{

	return container_of(inode, struct adfs_inode_info, vfs_inode);

}



/*

 * Directory handling

 */

fs/adfs/dir.c

+0 −8
Original line number Diff line number Diff line
@@ -9,15 +9,7 @@ 
 *

 *  Common directory handling for ADFS

 */

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/adfs_fs.h>

#include <linux/time.h>

#include <linux/stat.h>

#include <linux/spinlock.h>

#include <linux/smp_lock.h>

#include <linux/buffer_head.h>		/* for file_fsync() */



#include "adfs.h"



/*

fs/adfs/dir_f.c

+0 −8
Original line number Diff line number Diff line
@@ -9,15 +9,7 @@ 
 *

 *  E and F format directory handling

 */

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/adfs_fs.h>

#include <linux/time.h>

#include <linux/stat.h>

#include <linux/spinlock.h>

#include <linux/buffer_head.h>

#include <linux/string.h>



#include "adfs.h"

#include "dir_f.h"