X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Ffcntl.c;h=8e382a5d51bd6f757bd694344465de0711d4afb2;hb=32d90911568f67fad3f73623e106667a37c6e7ed;hp=4740d35e52cd72849ef18cd1879bc452085f8c7f;hpb=21b4e736922f546e0f1aa7b9d6c442f309a2444a;p=powerpc.git

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 4740d35e52..8e382a5d51 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -77,10 +77,9 @@ repeat:
 		start = files->next_fd;
 
 	newfd = start;
-	if (start < fdt->max_fdset) {
+	if (start < fdt->max_fds)
 		newfd = find_next_zero_bit(fdt->open_fds->fds_bits,
-			fdt->max_fdset, start);
-	}
+					   fdt->max_fds, start);
 	
 	error = -EMFILE;
 	if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
@@ -204,7 +203,7 @@ asmlinkage long sys_dup(unsigned int fildes)
 
 static int setfl(int fd, struct file * filp, unsigned long arg)
 {
-	struct inode * inode = filp->f_dentry->d_inode;
+	struct inode * inode = filp->f_path.dentry->d_inode;
 	int error = 0;
 
 	/*