aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 19:10:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 19:10:40 -0400
commitf7493e5d9cc10ac97cf1f1579fdc14117460b40b (patch)
tree5c73bd9418b24398b33c5eb2c2fb3ea749d8c631 /fs
parent989412bbd2835f1475d1528846693eddbac744c8 (diff)
vfs: tidy up sparse warnings in fs/namei.c
While doing the fs/namei.c cleanups, I ran sparse on it, and it pointed out other large integers and a couple of cases of us using '0' instead of the proper 'NULL'. Sparse still doesn't understand some of the conditional locking going on, but that's no excuse for not fixing up the trivial stuff. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 99a34717b2b0..73ec863a9896 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -161,7 +161,7 @@ static char *getname_flags(const char __user *filename, int flags, int *empty)
161 161
162char *getname(const char __user * filename) 162char *getname(const char __user * filename)
163{ 163{
164 return getname_flags(filename, 0, 0); 164 return getname_flags(filename, 0, NULL);
165} 165}
166 166
167#ifdef CONFIG_AUDITSYSCALL 167#ifdef CONFIG_AUDITSYSCALL
@@ -1408,7 +1408,7 @@ static inline int can_lookup(struct inode *inode)
1408 */ 1408 */
1409static inline long count_masked_bytes(unsigned long mask) 1409static inline long count_masked_bytes(unsigned long mask)
1410{ 1410{
1411 return mask*0x0001020304050608 >> 56; 1411 return mask*0x0001020304050608ul >> 56;
1412} 1412}
1413 1413
1414static inline unsigned int fold_hash(unsigned long hash) 1414static inline unsigned int fold_hash(unsigned long hash)
@@ -1972,7 +1972,7 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
1972int user_path_at(int dfd, const char __user *name, unsigned flags, 1972int user_path_at(int dfd, const char __user *name, unsigned flags,
1973 struct path *path) 1973 struct path *path)
1974{ 1974{
1975 return user_path_at_empty(dfd, name, flags, path, 0); 1975 return user_path_at_empty(dfd, name, flags, path, NULL);
1976} 1976}
1977 1977
1978static int user_path_parent(int dfd, const char __user *path, 1978static int user_path_parent(int dfd, const char __user *path,