andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libglusterfsclient: Check for directory on O_CREAT

Browse Source 
If we have received an O_CREAT for a name where that basename is a
directory, and if we have successfully looked up the inode for this directory,
then we can check for S_ISDIR in libglusterfsclient and prevent sending a message
to the server through libgf_client_creat. See also the comment inline.

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
This commit is contained in:
Shehjar Tikoo 2009-04-16 23:52:54 -07:00 committed by Anand V. Avati
parent 79215d4f24
commit 1873d0bdb5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libglusterfsclient/src/libglusterfsclient.c
View File

@ -1536,9 +1536,19 @@ glusterfs_open (glusterfs_handle_t handle,
fd = fd_create (loc.inode, 0);
fd->flags = flags;
if ((flags & O_CREAT) == O_CREAT)
if ((flags & O_CREAT) == O_CREAT) {
/* If we have the st_mode for the basename, check if
* it is a directory here itself, rather than sending
* a network message through libgf_client_creat, and
* then receiving a EISDIR.
*/
if (S_ISDIR (loc.inode->st_mode)) {
errno = EISDIR;
op_ret = -1;
goto op_over;
}
op_ret = libgf_client_creat (ctx, &loc, fd, flags, mode);
else {
} else {
if (S_ISDIR (loc.inode->st_mode)) {
if (((flags & O_RDONLY) == O_RDONLY) &&
((flags & O_WRONLY) == 0) &&
@ -1555,6 +1565,7 @@ glusterfs_open (glusterfs_handle_t handle,
}
}
op_over:
if (op_ret == -1) {
fd_unref (fd);
fd = NULL;