Commit c381bfcf authored Jul 17, 2007 by Mika Kukkonen Committed by Linus Torvalds Jul 17, 2007

Couple fixes to fs/ecryptfs/inode.c



Following was uncovered by compiling the kernel with '-W' flag:

  CC [M]  fs/ecryptfs/inode.o
fs/ecryptfs/inode.c: In function ‘ecryptfs_lookup’:
fs/ecryptfs/inode.c:304: warning: comparison of unsigned expression < 0 is always false
fs/ecryptfs/inode.c: In function ‘ecryptfs_symlink’:
fs/ecryptfs/inode.c:486: warning: comparison of unsigned expression < 0 is always false

Function ecryptfs_encode_filename() can return -ENOMEM, so change the
variables to plain int, as in the first case the only real use actually
expects int, and in latter case there is no use beoynd the error check.

Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 1269bc69

fs/ecryptfs/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ static struct dentry ecryptfs_lookup(struct inode dir, struct dentry *dentry,
		struct dentry *lower_dentry;
		struct vfsmount *lower_mnt;
		char *encoded_name;
		unsigned int encoded_namelen;
		int encoded_namelen;
		struct ecryptfs_crypt_stat *crypt_stat = NULL;
		struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
		char *page_virt = NULL;
		@@ -473,7 +473,7 @@ static int ecryptfs_symlink(struct inode dir, struct dentry dentry,
		struct dentry *lower_dir_dentry;
		umode_t mode;
		char *encoded_symname;
		unsigned int encoded_symlen;
		int encoded_symlen;
		struct ecryptfs_crypt_stat *crypt_stat = NULL;

		lower_dentry = ecryptfs_dentry_to_lower(dentry);

Admin message