Commit 6badd79b authored by Al Viro's avatar Al Viro
Browse files

kill ->dir_notify() 



Remove the hopelessly misguided ->dir_notify().  The only instance (cifs)
has been broken by design from the very beginning; the objects it creates
are never destroyed, keep references to struct file they can outlive, nothing
that could possibly evict them exists on close(2) path *and* no locking
whatsoever is done to prevent races with close(), should the previous, er,
deficiencies someday be dealt with.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b6b3fdea

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ prototypes: 
	unsigned long (*get_unmapped_area)(struct file *, unsigned long,

			unsigned long, unsigned long, unsigned long);

	int (*check_flags)(int);

	int (*dir_notify)(struct file *, unsigned long);

};



locking rules:
@@ -424,7 +423,6 @@ sendfile: no 
sendpage:		no

get_unmapped_area:	no

check_flags:		no

dir_notify:		no



->llseek() locking has moved from llseek to the individual llseek

implementations.  If your fs is not using generic_file_llseek, you

Documentation/filesystems/vfs.txt

+0 −3
Original line number Diff line number Diff line
@@ -733,7 +733,6 @@ struct file_operations { 
	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);

	int (*check_flags)(int);

	int (*dir_notify)(struct file *filp, unsigned long arg);

	int (*flock) (struct file *, int, struct file_lock *);

	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int);

	ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);
@@ -800,8 +799,6 @@ otherwise noted. 


  check_flags: called by the fcntl(2) system call for F_SETFL command



  dir_notify: called by the fcntl(2) system call for F_NOTIFY command



  flock: called by the flock(2) system call



  splice_write: called by the VFS to splice data from a pipe to a file. This

fs/bad_inode.c

+0 −6
Original line number Diff line number Diff line
@@ -132,11 +132,6 @@ static int bad_file_check_flags(int flags) 
	return -EIO;

}



static int bad_file_dir_notify(struct file *file, unsigned long arg)

{

	return -EIO;

}



static int bad_file_flock(struct file *filp, int cmd, struct file_lock *fl)

{

	return -EIO;
@@ -179,7 +174,6 @@ static const struct file_operations bad_file_ops = 
	.sendpage	= bad_file_sendpage,

	.get_unmapped_area = bad_file_get_unmapped_area,

	.check_flags	= bad_file_check_flags,

	.dir_notify	= bad_file_dir_notify,

	.flock		= bad_file_flock,

	.splice_write	= bad_file_splice_write,

	.splice_read	= bad_file_splice_read,

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ obj-$(CONFIG_CIFS) += cifs.o 


cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \

	  link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o \

	  md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o \

	  md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o cifsacl.o



cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o

fs/cifs/cifsfs.c

+0 −7
Original line number Diff line number Diff line
@@ -747,7 +747,6 @@ const struct file_operations cifs_file_ops = { 
#endif /* CONFIG_CIFS_POSIX */



#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

	.setlease = cifs_setlease,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

};
@@ -768,7 +767,6 @@ const struct file_operations cifs_file_direct_ops = { 
#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

	.setlease = cifs_setlease,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

};
@@ -789,7 +787,6 @@ const struct file_operations cifs_file_nobrl_ops = { 
#endif /* CONFIG_CIFS_POSIX */



#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

	.setlease = cifs_setlease,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

};
@@ -809,7 +806,6 @@ const struct file_operations cifs_file_direct_nobrl_ops = { 
#endif /* CONFIG_CIFS_POSIX */

	.llseek = cifs_llseek,

#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

	.setlease = cifs_setlease,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

};
@@ -818,9 +814,6 @@ const struct file_operations cifs_dir_ops = { 
	.readdir = cifs_readdir,

	.release = cifs_closedir,

	.read    = generic_read_dir,

#ifdef CONFIG_CIFS_EXPERIMENTAL

	.dir_notify = cifs_dir_notify,

#endif /* CONFIG_CIFS_EXPERIMENTAL */

	.unlocked_ioctl  = cifs_ioctl,

	.llseek = generic_file_llseek,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE