Commit 32ef9553 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsnotify_for_v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull fsnotify updates from Jan Kara:
 "Three fsnotify cleanups"

* tag 'fsnotify_for_v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fsnotify: Add git tree reference to MAINTAINERS
  fsnotify/fdinfo: exportfs_encode_inode_fh() takes pointer as 4th argument
  fsnotify: move declaration of fsnotify_mark_connector_cachep to fsnotify.h
parents b8072d5b 67e6b4ef

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6758,6 +6758,7 @@ FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE 
M:	Jan Kara <jack@suse.cz>

R:	Amir Goldstein <amir73il@gmail.com>

L:	linux-fsdevel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git fsnotify

S:	Maintained

F:	fs/notify/

F:	include/linux/fsnotify*.h

fs/notify/fdinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void show_mark_fhandle(struct seq_file *m, struct inode *inode) 
	f.handle.handle_bytes = sizeof(f.pad);

	size = f.handle.handle_bytes >> 2;



	ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, 0);

	ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, NULL);

	if ((ret == FILEID_INVALID) || (ret < 0)) {

		WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);

		return;

fs/notify/fsnotify.c

+0 −2
Original line number Diff line number Diff line
@@ -381,8 +381,6 @@ out: 
}

EXPORT_SYMBOL_GPL(fsnotify);



extern struct kmem_cache *fsnotify_mark_connector_cachep;



static __init int fsnotify_init(void)

{

	int ret;

fs/notify/fsnotify.h

+2 −0
Original line number Diff line number Diff line
@@ -65,4 +65,6 @@ extern void __fsnotify_update_child_dentry_flags(struct inode *inode); 
extern struct fsnotify_event_holder *fsnotify_alloc_event_holder(void);

extern void fsnotify_destroy_event_holder(struct fsnotify_event_holder *holder);



extern struct kmem_cache *fsnotify_mark_connector_cachep;



#endif	/* __FS_NOTIFY_FSNOTIFY_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE