Commit 60a94835 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'warning-fixes-20211005' of... 

Merge tag 'warning-fixes-20211005' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull misc fs warning fixes from David Howells:
 "The first four patches fix kerneldoc warnings in fscache, afs, 9p and
  nfs - they're mostly just comment changes, though there's one place in
  9p where a comment got detached from the function it was attached to
  (v9fs_fid_add) and has to switch places with a function that got
  inserted between (__add_fid).

  The patch on the end removes an unused symbol in fscache"

* tag 'warning-fixes-20211005' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  fscache: Remove an unused static variable
  fscache: Fix some kerneldoc warnings shown up by W=1
  9p: Fix a bunch of kerneldoc warnings shown up by W=1
  afs: Fix kerneldoc warning shown up by W=1
  nfs: Fix kerneldoc warning shown up by W=1
parents f6274b06 ef31499a

fs/9p/cache.c

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct fscache_netfs v9fs_cache_netfs = { 
	.version 	= 0,

};



/**

/*

 * v9fs_random_cachetag - Generate a random tag to be associated

 *			  with a new cache session.

 *
@@ -233,7 +233,7 @@ static void v9fs_vfs_readpage_complete(struct page *page, void *data, 
	unlock_page(page);

}



/**

/*

 * __v9fs_readpage_from_fscache - read a page from cache

 *

 * Returns 0 if the pages are in cache and a BIO is submitted,
@@ -268,7 +268,7 @@ int __v9fs_readpage_from_fscache(struct inode *inode, struct page *page) 
	}

}



/**

/*

 * __v9fs_readpages_from_fscache - read multiple pages from cache

 *

 * Returns 0 if the pages are in cache and a BIO is submitted,
@@ -308,7 +308,7 @@ int __v9fs_readpages_from_fscache(struct inode *inode, 
	}

}



/**

/*

 * __v9fs_readpage_to_fscache - write a page to the cache

 *

 */

fs/9p/fid.c

+7 −7
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ 
#include "v9fs_vfs.h"

#include "fid.h"



static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)

{

	hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata);

}





/**

 * v9fs_fid_add - add a fid to a dentry

 * @dentry: dentry that the fid is being added to

 * @fid: fid to add

 *

 */



static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)

{

	hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata);

}



void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)

{

	spin_lock(&dentry->d_lock);
@@ -67,7 +67,7 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *inode, kuid_t uid) 


/**

 * v9fs_open_fid_add - add an open fid to an inode

 * @dentry: inode that the fid is being added to

 * @inode: inode that the fid is being added to

 * @fid: fid to add

 *

 */

fs/9p/v9fs.c

+3 −5
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ int v9fs_show_options(struct seq_file *m, struct dentry *root) 
/**

 * v9fs_parse_options - parse mount options into session structure

 * @v9ses: existing v9fs session information

 * @opts: The mount option string

 *

 * Return 0 upon success, -ERRNO upon failure.

 */
@@ -542,12 +543,9 @@ extern int v9fs_error_init(void); 
static struct kobject *v9fs_kobj;



#ifdef CONFIG_9P_FSCACHE

/**

 * caches_show - list caches associated with a session

 *

 * Returns the size of buffer written.

/*

 * List caches associated with a session

 */



static ssize_t caches_show(struct kobject *kobj,

			   struct kobj_attribute *attr,

			   char *buf)

fs/9p/vfs_addr.c

+9 −5
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 


/**

 * v9fs_fid_readpage - read an entire page in from 9P

 *

 * @fid: fid being read

 * @data: Opaque pointer to the fid being read

 * @page: structure to page

 *

 */
@@ -116,6 +115,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping, 


/**

 * v9fs_release_page - release the private state associated with a page

 * @page: The page to be released

 * @gfp: The caller's allocation restrictions

 *

 * Returns 1 if the page can be released, false otherwise.

 */
@@ -129,9 +130,9 @@ static int v9fs_release_page(struct page *page, gfp_t gfp) 


/**

 * v9fs_invalidate_page - Invalidate a page completely or partially

 *

 * @page: structure to page

 * @offset: offset in the page

 * @page: The page to be invalidated

 * @offset: offset of the invalidated region

 * @length: length of the invalidated region

 */



static void v9fs_invalidate_page(struct page *page, unsigned int offset,
@@ -199,6 +200,8 @@ static int v9fs_vfs_writepage(struct page *page, struct writeback_control *wbc) 


/**

 * v9fs_launder_page - Writeback a dirty page

 * @page: The page to be cleaned up

 *

 * Returns 0 on success.

 */
@@ -219,6 +222,7 @@ static int v9fs_launder_page(struct page *page) 
/**

 * v9fs_direct_IO - 9P address space operation for direct I/O

 * @iocb: target I/O control block

 * @iter: The data/buffer to use

 *

 * The presence of v9fs_direct_IO() in the address space ops vector

 * allowes open() O_DIRECT flags which would have failed otherwise.

fs/9p/vfs_file.c

+12 −21
Original line number Diff line number Diff line
@@ -359,14 +359,11 @@ static int v9fs_file_flock_dotl(struct file *filp, int cmd, 
}



/**

 * v9fs_file_read - read from a file

 * @filp: file pointer to read

 * @udata: user data buffer to read data into

 * @count: size of buffer

 * @offset: offset at which to read data

 * v9fs_file_read_iter - read from a file

 * @iocb: The operation parameters

 * @to: The buffer to read into

 *

 */



static ssize_t

v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)

{
@@ -388,11 +385,9 @@ v9fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
}



/**

 * v9fs_file_write - write to a file

 * @filp: file pointer to write

 * @data: data buffer to write data from

 * @count: size of buffer

 * @offset: offset at which to write data

 * v9fs_file_write_iter - write to a file

 * @iocb: The operation parameters

 * @from: The data to write

 *

 */

static ssize_t
@@ -561,11 +556,9 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf) 
}



/**

 * v9fs_mmap_file_read - read from a file

 * @filp: file pointer to read

 * @data: user data buffer to read data into

 * @count: size of buffer

 * @offset: offset at which to read data

 * v9fs_mmap_file_read_iter - read from a file

 * @iocb: The operation parameters

 * @to: The buffer to read into

 *

 */

static ssize_t
@@ -576,11 +569,9 @@ v9fs_mmap_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
}



/**

 * v9fs_mmap_file_write - write to a file

 * @filp: file pointer to write

 * @data: data buffer to write data from

 * @count: size of buffer

 * @offset: offset at which to write data

 * v9fs_mmap_file_write_iter - write to a file

 * @iocb: The operation parameters

 * @from: The data to write

 *

 */

static ssize_t